From 90c5f2f9537cde699424943e2b63036ca50a479e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 8 Sep 2020 04:20:00 +0000 Subject: libuv: 1.38.1 -> 1.39.0 --- pkgs/development/libraries/libuv/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries/libuv/default.nix') diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index cf73a64f675..1314eab1642 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.38.1"; + version = "1.39.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0cvabjhi53qw94zyjkqamx0c607ayydfb4f3djx2gj8ab2p7s29n"; + sha256 = "1r9xs9is5rgid5ylbprvf88lqjrmvky86q9h8iqlq7rcrv24x6kl"; }; postPatch = let @@ -66,7 +66,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; - homepage = "https://github.com/libuv/libuv"; + homepage = "https://libuv.org/"; + changelog = "https://github.com/libuv/libuv/blob/v${version}/ChangeLog"; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; linux ++ darwin; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; -- cgit 1.4.1 From 13eb51b092e48fb343affc431942ef88716a6be6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 25 Sep 2020 04:20:00 +0000 Subject: libuv: 1.39.0 -> 1.40.0 --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/libuv/default.nix') diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 1314eab1642..fa661446b9a 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.39.0"; + version = "1.40.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1r9xs9is5rgid5ylbprvf88lqjrmvky86q9h8iqlq7rcrv24x6kl"; + sha256 = "1hd0x6i80ca3j0c3a7laygzab5qkgxjkz692jwzrsinsfhvbq0pg"; }; postPatch = let -- cgit 1.4.1 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. --- .../accessibility/contrast/default.nix | 4 +- pkgs/applications/accessibility/dasher/default.nix | 4 +- .../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 +- .../applications/audio/cozy-audiobooks/default.nix | 4 +- pkgs/applications/audio/deadbeef/default.nix | 4 +- .../audio/deadbeef/plugins/headerbar-gtk3.nix | 4 +- .../audio/deadbeef/plugins/infobar.nix | 4 +- .../audio/deadbeef/plugins/lyricbar.nix | 4 +- .../applications/audio/deadbeef/plugins/mpris2.nix | 4 +- pkgs/applications/audio/denemo/default.nix | 4 +- .../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 +- .../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 +- .../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 +- .../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 +- .../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 +- .../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 +- .../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 +- .../audio/soundscape-renderer/default.nix | 4 +- pkgs/applications/audio/spectmorph/default.nix | 4 +- pkgs/applications/audio/spectrojack/default.nix | 4 +- .../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 +- .../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 +- .../blockchains/monero-gui/default.nix | 4 +- pkgs/applications/blockchains/monero/default.nix | 4 +- pkgs/applications/blockchains/namecoin.nix | 4 +- .../blockchains/nano-wallet/default.nix | 4 +- .../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 +- .../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 +- .../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 +- .../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 +- .../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 +- .../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 +- .../applications/graphics/kgraphviewer/default.nix | 4 +- pkgs/applications/graphics/ktikz/default.nix | 4 +- .../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 +- .../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 +- .../applications/graphics/synfigstudio/default.nix | 6 +- .../applications/graphics/tesseract/tesseract3.nix | 4 +- .../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 +- .../networking/browsers/asuka/default.nix | 4 +- .../networking/browsers/chromium/common.nix | 4 +- .../networking/browsers/elinks/default.nix | 4 +- .../networking/browsers/eolie/default.nix | 4 +- .../networking/browsers/ephemeral/default.nix | 4 +- .../networking/browsers/falkon/default.nix | 4 +- .../networking/browsers/links2/default.nix | 4 +- .../networking/browsers/midori/default.nix | 4 +- .../networking/browsers/netsurf/browser.nix | 4 +- .../networking/browsers/netsurf/libcss.nix | 4 +- .../networking/browsers/netsurf/libdom.nix | 4 +- .../networking/browsers/netsurf/libhubbub.nix | 4 +- .../networking/browsers/netsurf/libnsbmp.nix | 4 +- .../networking/browsers/netsurf/libnsfb.nix | 4 +- .../networking/browsers/netsurf/libnsgif.nix | 4 +- .../networking/browsers/netsurf/libnslog.nix | 4 +- .../networking/browsers/netsurf/libnspsl.nix | 4 +- .../networking/browsers/netsurf/libnsutils.nix | 4 +- .../networking/browsers/netsurf/libsvgtiny.nix | 4 +- .../networking/browsers/netsurf/libutf8proc.nix | 4 +- .../networking/browsers/surf/default.nix | 4 +- .../networking/browsers/vimb/default.nix | 4 +- .../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 +- .../networking/newsreaders/pan/default.nix | 4 +- pkgs/applications/networking/nym/default.nix | 4 +- .../networking/owncloud-client/default.nix | 4 +- .../networking/p2p/eiskaltdcpp/default.nix | 4 +- .../applications/networking/p2p/gnunet/default.nix | 4 +- pkgs/applications/networking/p2p/ncdc/default.nix | 4 +- .../networking/p2p/qbittorrent/default.nix | 4 +- .../networking/p2p/retroshare/default.nix | 4 +- .../networking/p2p/synapse-bt/default.nix | 4 +- .../networking/p2p/torrential/default.nix | 4 +- .../networking/p2p/transgui/default.nix | 4 +- .../p2p/transmission-remote-gtk/default.nix | 4 +- .../networking/p2p/transmission/default.nix | 4 +- .../networking/p2p/twister/default.nix | 4 +- .../networking/remote/freerdp/default.nix | 4 +- .../networking/remote/putty/default.nix | 4 +- .../networking/remote/rdesktop/default.nix | 4 +- .../networking/remote/remmina/default.nix | 4 +- .../networking/remote/x2goclient/default.nix | 4 +- .../networking/remote/xrdp/default.nix | 6 +- .../networking/sniffers/etherape/default.nix | 4 +- .../networking/sniffers/ettercap/default.nix | 4 +- .../networking/sniffers/kismet/default.nix | 4 +- .../networking/sniffers/wireshark/default.nix | 4 +- pkgs/applications/networking/sniproxy/default.nix | 4 +- .../networking/sync/casync/default.nix | 4 +- .../networking/sync/lsyncd/default.nix | 4 +- .../networking/sync/onedrive/default.nix | 4 +- pkgs/applications/networking/vnstat/default.nix | 4 +- .../networking/weather/meteo/default.nix | 4 +- pkgs/applications/networking/znc/default.nix | 4 +- .../science/astronomy/celestia/default.nix | 4 +- .../science/astronomy/gildas/default.nix | 4 +- .../science/astronomy/gpredict/default.nix | 4 +- .../science/astronomy/xplanet/default.nix | 4 +- .../science/biology/EZminc/default.nix | 4 +- .../science/biology/exonerate/default.nix | 4 +- .../science/biology/neuron/default.nix | 4 +- .../science/biology/sortmerna/default.nix | 4 +- .../science/biology/vcftools/default.nix | 4 +- .../science/chemistry/avogadro/default.nix | 4 +- .../science/electronics/dsview/default.nix | 4 +- .../science/electronics/dsview/libsigrok4dsl.nix | 4 +- .../electronics/dsview/libsigrokdecode4dsl.nix | 4 +- .../science/electronics/fped/default.nix | 4 +- .../science/electronics/fritzing/default.nix | 4 +- .../science/electronics/geda/default.nix | 4 +- .../science/electronics/gerbv/default.nix | 4 +- .../science/electronics/gtkwave/default.nix | 4 +- .../electronics/hal-hardware-analyzer/default.nix | 4 +- .../science/electronics/horizon-eda/default.nix | 4 +- .../science/electronics/hyp2mat/default.nix | 4 +- .../science/electronics/kicad/base.nix | 4 +- .../science/electronics/pcb/default.nix | 4 +- .../science/electronics/pulseview/default.nix | 4 +- .../science/electronics/xcircuit/default.nix | 4 +- .../science/electronics/xoscope/default.nix | 4 +- .../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 +- .../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 +- .../science/math/qalculate-gtk/default.nix | 4 +- .../science/math/rofi-calc/default.nix | 4 +- pkgs/applications/science/math/sage/default.nix | 6 +- .../applications/science/math/singular/default.nix | 4 +- pkgs/applications/science/misc/boinc/default.nix | 4 +- .../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 +- .../science/robotics/qgroundcontrol/default.nix | 4 +- .../terminal-emulators/alacritty/default.nix | 4 +- .../terminal-emulators/eterm/default.nix | 4 +- .../terminal-emulators/evilvte/default.nix | 4 +- .../terminal-emulators/havoc/default.nix | 4 +- .../terminal-emulators/kitty/default.nix | 4 +- .../terminal-emulators/lilyterm/default.nix | 4 +- .../terminal-emulators/lxterminal/default.nix | 4 +- .../terminal-emulators/mlterm/default.nix | 4 +- .../terminal-emulators/mrxvt/default.nix | 4 +- .../terminal-emulators/roxterm/default.nix | 4 +- .../rxvt-unicode-plugins/urxvt-bidi/default.nix | 4 +- .../terminal-emulators/rxvt-unicode/default.nix | 4 +- .../terminal-emulators/rxvt/default.nix | 4 +- .../terminal-emulators/sakura/default.nix | 4 +- .../applications/terminal-emulators/st/default.nix | 4 +- pkgs/applications/terminal-emulators/st/xst.nix | 4 +- .../terminal-emulators/stupidterm/default.nix | 6 +- .../terminal-emulators/termite/default.nix | 4 +- .../terminal-emulators/tilix/default.nix | 4 +- .../terminal-emulators/wayst/default.nix | 4 +- .../terminal-emulators/xterm/default.nix | 4 +- .../version-management/bitkeeper/default.nix | 4 +- .../git-and-tools/cgit/default.nix | 4 +- .../git-and-tools/git-dit/default.nix | 4 +- .../git-and-tools/git-gone/default.nix | 4 +- .../git-and-tools/git-ignore/default.nix | 4 +- .../git-and-tools/git-workspace/default.nix | 4 +- .../git-and-tools/git/default.nix | 4 +- .../git-and-tools/gitin/default.nix | 4 +- .../git-and-tools/grv/default.nix | 4 +- .../git-and-tools/tig/default.nix | 4 +- .../version-management/gitlab/gitaly/default.nix | 4 +- .../version-management/gitoxide/default.nix | 2 +- .../version-management/gource/default.nix | 4 +- .../version-management/guitone/default.nix | 4 +- .../version-management/monotone-viz/default.nix | 6 +- .../monotone-viz/graphviz-2.0.nix | 4 +- .../version-management/monotone/default.nix | 4 +- .../window-managers/afterstep/default.nix | 6 +- .../window-managers/awesome/default.nix | 4 +- pkgs/applications/window-managers/cwm/default.nix | 4 +- .../window-managers/dwm/dwm-status.nix | 4 +- .../applications/window-managers/dzen2/default.nix | 4 +- .../window-managers/fbpanel/default.nix | 4 +- .../window-managers/fluxbox/default.nix | 4 +- pkgs/applications/window-managers/fvwm/default.nix | 4 +- .../window-managers/herbstluftwm/default.nix | 4 +- .../window-managers/hikari/default.nix | 4 +- pkgs/applications/window-managers/i3/easyfocus.nix | 4 +- .../applications/window-managers/i3/i3ipc-glib.nix | 4 +- .../applications/window-managers/i3/lock-color.nix | 4 +- pkgs/applications/window-managers/i3/lock.nix | 4 +- .../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 +- .../window-managers/matchbox/default.nix | 4 +- .../window-managers/neocomp/default.nix | 4 +- .../window-managers/notion/default.nix | 4 +- .../window-managers/openbox/default.nix | 4 +- .../window-managers/oroborus/default.nix | 4 +- .../applications/window-managers/qtile/default.nix | 4 +- .../window-managers/ratpoison/default.nix | 4 +- .../window-managers/spectrwm/default.nix | 4 +- pkgs/applications/window-managers/sway/bg.nix | 4 +- pkgs/applications/window-managers/sway/idle.nix | 4 +- .../window-managers/sway/lock-effects.nix | 4 +- pkgs/applications/window-managers/sway/lock.nix | 4 +- .../window-managers/trayer/default.nix | 4 +- pkgs/applications/window-managers/vwm/default.nix | 4 +- .../window-managers/windowlab/default.nix | 4 +- .../window-managers/windowmaker/default.nix | 4 +- .../windowmaker/dockapps/wmsystemtray.nix | 4 +- .../window-managers/wmii-hg/default.nix | 4 +- .../window-managers/xmonad/log-applet/default.nix | 4 +- pkgs/applications/window-managers/yabar/build.nix | 4 +- .../build-support/build-dotnet-package/default.nix | 4 +- .../build-fhs-userenv/chrootenv/default.nix | 4 +- pkgs/build-support/dotnetbuildhelpers/default.nix | 4 +- pkgs/build-support/writers/default.nix | 2 +- .../compilers/adoptopenjdk-icedtea-web/default.nix | 4 +- pkgs/development/compilers/bluespec/default.nix | 4 +- .../compilers/crystal/build-package.nix | 4 +- pkgs/development/compilers/crystal/default.nix | 6 +- pkgs/development/compilers/dtc/default.nix | 4 +- pkgs/development/compilers/factor-lang/default.nix | 4 +- pkgs/development/compilers/flux/default.nix | 4 +- pkgs/development/compilers/fsharp/default.nix | 4 +- pkgs/development/compilers/fsharp41/default.nix | 4 +- pkgs/development/compilers/gcc/4.8/default.nix | 4 +- pkgs/development/compilers/gcc/4.9/default.nix | 4 +- pkgs/development/compilers/gcc/6/default.nix | 4 +- pkgs/development/compilers/ghcjs-ng/default.nix | 4 +- .../compilers/gnu-smalltalk/default.nix | 4 +- pkgs/development/compilers/go/1.14.nix | 4 +- pkgs/development/compilers/go/1.15.nix | 4 +- pkgs/development/compilers/go/1.4.nix | 4 +- pkgs/development/compilers/go/2-dev.nix | 4 +- .../compilers/intel-graphics-compiler/default.nix | 2 +- pkgs/development/compilers/intercal/default.nix | 4 +- pkgs/development/compilers/neko/default.nix | 4 +- pkgs/development/compilers/openjdk/11.nix | 4 +- pkgs/development/compilers/openjdk/12.nix | 4 +- pkgs/development/compilers/openjdk/13.nix | 4 +- pkgs/development/compilers/openjdk/8.nix | 4 +- pkgs/development/compilers/openjdk/openjfx/11.nix | 4 +- pkgs/development/compilers/openjdk/openjfx/15.nix | 4 +- pkgs/development/compilers/rust/cargo.nix | 4 +- pkgs/development/compilers/rust/rls/default.nix | 4 +- pkgs/development/compilers/rust/rustc.nix | 4 +- .../compilers/sagittarius-scheme/default.nix | 4 +- pkgs/development/compilers/squeak/default.nix | 4 +- pkgs/development/compilers/swi-prolog/default.nix | 4 +- pkgs/development/compilers/swift/default.nix | 6 +- pkgs/development/compilers/vala/default.nix | 4 +- .../guile-modules/guile-cairo/default.nix | 4 +- .../guile-modules/guile-fibers/default.nix | 4 +- .../guile-modules/guile-gnome/default.nix | 4 +- .../guile-modules/guile-lib/default.nix | 4 +- .../guile-modules/guile-ncurses/default.nix | 4 +- .../guile-modules/guile-opengl/default.nix | 4 +- .../guile-modules/guile-reader/default.nix | 4 +- .../guile-modules/guile-sdl/default.nix | 4 +- .../guile-modules/guile-sdl2/default.nix | 4 +- .../guile-modules/guile-xcb/default.nix | 4 +- .../haskell-modules/configuration-nix.nix | 2 +- .../haskell-modules/generic-builder.nix | 14 +- .../haskell-modules/generic-stack-builder.nix | 4 +- pkgs/development/haskell-modules/lib.nix | 2 +- pkgs/development/idris-modules/glfw.nix | 2 +- pkgs/development/idris-modules/sdl2.nix | 4 +- pkgs/development/interpreters/evcxr/default.nix | 4 +- pkgs/development/interpreters/falcon/default.nix | 4 +- .../interpreters/gtk-server/default.nix | 4 +- pkgs/development/interpreters/guile/1.8.nix | 4 +- pkgs/development/interpreters/guile/2.0.nix | 4 +- pkgs/development/interpreters/guile/default.nix | 4 +- pkgs/development/interpreters/io/default.nix | 4 +- pkgs/development/interpreters/lolcode/default.nix | 4 +- pkgs/development/interpreters/love/0.10.nix | 4 +- pkgs/development/interpreters/love/0.7.nix | 4 +- pkgs/development/interpreters/love/0.8.nix | 4 +- pkgs/development/interpreters/love/0.9.nix | 4 +- pkgs/development/interpreters/love/11.1.nix | 4 +- .../interpreters/micropython/default.nix | 4 +- pkgs/development/interpreters/nix-exec/default.nix | 4 +- pkgs/development/interpreters/octave/default.nix | 4 +- pkgs/development/interpreters/php/generic.nix | 4 +- pkgs/development/interpreters/pixie/default.nix | 4 +- .../interpreters/python/pypy/default.nix | 4 +- pkgs/development/interpreters/qnial/default.nix | 4 +- pkgs/development/interpreters/renpy/default.nix | 4 +- .../interpreters/spidermonkey/1.8.5.nix | 4 +- pkgs/development/interpreters/spidermonkey/38.nix | 4 +- pkgs/development/interpreters/spidermonkey/60.nix | 4 +- pkgs/development/interpreters/spidermonkey/68.nix | 4 +- pkgs/development/interpreters/spidermonkey/78.nix | 4 +- .../interpreters/supercollider/default.nix | 4 +- pkgs/development/libraries/SDL/default.nix | 4 +- pkgs/development/libraries/SDL2/default.nix | 6 +- pkgs/development/libraries/SDL_Pango/default.nix | 4 +- pkgs/development/libraries/SDL_sixel/default.nix | 4 +- pkgs/development/libraries/Xaw3d/default.nix | 4 +- pkgs/development/libraries/accounts-qt/default.nix | 4 +- .../libraries/accountsservice/default.nix | 4 +- pkgs/development/libraries/ace/default.nix | 4 +- pkgs/development/libraries/agg/default.nix | 4 +- pkgs/development/libraries/allegro/5.nix | 4 +- pkgs/development/libraries/amdvlk/default.nix | 4 +- pkgs/development/libraries/amtk/default.nix | 4 +- .../libraries/appstream-glib/default.nix | 4 +- pkgs/development/libraries/appstream/default.nix | 4 +- pkgs/development/libraries/aqbanking/default.nix | 4 +- .../development/libraries/aqbanking/gwenhywfar.nix | 4 +- .../libraries/aqbanking/libchipcard.nix | 4 +- pkgs/development/libraries/aravis/default.nix | 4 +- pkgs/development/libraries/aribb25/default.nix | 4 +- pkgs/development/libraries/arrayfire/default.nix | 4 +- pkgs/development/libraries/at-spi2-atk/default.nix | 4 +- .../development/libraries/at-spi2-core/default.nix | 4 +- pkgs/development/libraries/atk/default.nix | 4 +- pkgs/development/libraries/atkmm/default.nix | 4 +- pkgs/development/libraries/aubio/default.nix | 4 +- .../libraries/audio/libbs2b/default.nix | 4 +- .../development/libraries/audio/libsmf/default.nix | 4 +- pkgs/development/libraries/audio/lilv/default.nix | 4 +- pkgs/development/libraries/audio/lv2/default.nix | 4 +- pkgs/development/libraries/audio/lvtk/default.nix | 4 +- pkgs/development/libraries/audio/ntk/default.nix | 4 +- pkgs/development/libraries/audio/raul/default.nix | 4 +- .../development/libraries/audio/rtmidi/default.nix | 4 +- .../development/libraries/audio/sratom/default.nix | 4 +- pkgs/development/libraries/audio/suil/default.nix | 4 +- .../libraries/audio/vamp-plugin-sdk/default.nix | 4 +- pkgs/development/libraries/avahi/default.nix | 6 +- pkgs/development/libraries/avro-c/default.nix | 4 +- pkgs/development/libraries/babl/default.nix | 4 +- pkgs/development/libraries/bamf/default.nix | 4 +- pkgs/development/libraries/beignet/default.nix | 6 +- pkgs/development/libraries/biblesync/default.nix | 4 +- pkgs/development/libraries/boehm-gc/7.6.6.nix | 4 +- pkgs/development/libraries/boolstuff/default.nix | 4 +- pkgs/development/libraries/cairo/default.nix | 4 +- pkgs/development/libraries/cairomm/default.nix | 4 +- pkgs/development/libraries/capstone/default.nix | 4 +- pkgs/development/libraries/ccrtp/default.nix | 4 +- pkgs/development/libraries/clutter-gst/default.nix | 4 +- pkgs/development/libraries/clutter-gtk/default.nix | 4 +- pkgs/development/libraries/clutter/default.nix | 4 +- pkgs/development/libraries/cmrt/default.nix | 4 +- pkgs/development/libraries/cogl/default.nix | 4 +- pkgs/development/libraries/cre2/default.nix | 4 +- pkgs/development/libraries/ctl/default.nix | 4 +- pkgs/development/libraries/ctpl/default.nix | 4 +- pkgs/development/libraries/ctypes_sh/default.nix | 4 +- pkgs/development/libraries/cutelyst/default.nix | 4 +- pkgs/development/libraries/cwiid/default.nix | 4 +- pkgs/development/libraries/dav1d/default.nix | 4 +- .../libraries/dbus-cplusplus/default.nix | 4 +- pkgs/development/libraries/dbus-glib/default.nix | 4 +- .../dbus-sharp-glib/dbus-sharp-glib-1.0.nix | 4 +- .../libraries/dbus-sharp-glib/default.nix | 4 +- .../libraries/dbus-sharp/dbus-sharp-1.0.nix | 4 +- pkgs/development/libraries/dbus-sharp/default.nix | 4 +- pkgs/development/libraries/dbus/default.nix | 4 +- pkgs/development/libraries/dee/default.nix | 4 +- pkgs/development/libraries/directfb/default.nix | 4 +- .../libraries/dleyna-connector-dbus/default.nix | 4 +- pkgs/development/libraries/dleyna-core/default.nix | 4 +- .../libraries/dleyna-renderer/default.nix | 4 +- .../libraries/dleyna-server/default.nix | 4 +- pkgs/development/libraries/dlib/default.nix | 4 +- pkgs/development/libraries/dqlite/default.nix | 4 +- pkgs/development/libraries/dssi/default.nix | 4 +- pkgs/development/libraries/dxflib/default.nix | 2 +- pkgs/development/libraries/egl-wayland/default.nix | 4 +- .../libraries/elementary-cmake-modules/default.nix | 4 +- pkgs/development/libraries/embree/default.nix | 4 +- pkgs/development/libraries/enchant/1.x.nix | 4 +- pkgs/development/libraries/epoxy/default.nix | 4 +- pkgs/development/libraries/exosip/default.nix | 4 +- pkgs/development/libraries/farstream/default.nix | 4 +- .../development/libraries/fflas-ffpack/default.nix | 4 +- pkgs/development/libraries/ffmpeg-full/default.nix | 4 +- .../development/libraries/ffmpeg-sixel/default.nix | 4 +- pkgs/development/libraries/ffmpeg/generic.nix | 4 +- pkgs/development/libraries/ffms/default.nix | 4 +- pkgs/development/libraries/fltk/1.4.nix | 4 +- pkgs/development/libraries/fltk/default.nix | 4 +- pkgs/development/libraries/folks/default.nix | 4 +- pkgs/development/libraries/forge/default.nix | 4 +- pkgs/development/libraries/frame/default.nix | 4 +- pkgs/development/libraries/freenect/default.nix | 4 +- pkgs/development/libraries/freetds/default.nix | 4 +- pkgs/development/libraries/freetype/default.nix | 6 +- pkgs/development/libraries/frei0r/default.nix | 4 +- pkgs/development/libraries/fribidi/default.nix | 4 +- pkgs/development/libraries/fstrm/default.nix | 4 +- pkgs/development/libraries/gaia/default.nix | 4 +- pkgs/development/libraries/gamin/default.nix | 4 +- pkgs/development/libraries/ganv/default.nix | 4 +- pkgs/development/libraries/gcab/default.nix | 4 +- pkgs/development/libraries/gcr/default.nix | 4 +- pkgs/development/libraries/gdata-sharp/default.nix | 4 +- pkgs/development/libraries/gdl/default.nix | 4 +- pkgs/development/libraries/gdome2/default.nix | 4 +- pkgs/development/libraries/gegl/4.0.nix | 4 +- pkgs/development/libraries/gegl/default.nix | 4 +- pkgs/development/libraries/geis/default.nix | 4 +- pkgs/development/libraries/geoclue/default.nix | 4 +- .../development/libraries/geocode-glib/default.nix | 4 +- pkgs/development/libraries/gexiv2/default.nix | 4 +- pkgs/development/libraries/gfbgraph/default.nix | 4 +- pkgs/development/libraries/gio-sharp/default.nix | 4 +- pkgs/development/libraries/gjs/default.nix | 4 +- .../libraries/glib-networking/default.nix | 4 +- .../development/libraries/glib-testing/default.nix | 4 +- pkgs/development/libraries/glib/default.nix | 6 +- pkgs/development/libraries/glibmm/default.nix | 4 +- .../libraries/globalplatform/default.nix | 4 +- .../globalplatform/gppcscconnectionplugin.nix | 4 +- pkgs/development/libraries/gmime/2.nix | 4 +- pkgs/development/libraries/gmime/3.nix | 4 +- pkgs/development/libraries/gmtk/default.nix | 4 +- pkgs/development/libraries/gnet/default.nix | 4 +- pkgs/development/libraries/gnome-menus/default.nix | 4 +- pkgs/development/libraries/gnome-sharp/default.nix | 4 +- .../libraries/gnome-video-effects/default.nix | 4 +- pkgs/development/libraries/gnutls-kdh/generic.nix | 6 +- pkgs/development/libraries/gnutls/default.nix | 8 +- pkgs/development/libraries/goffice/default.nix | 4 +- pkgs/development/libraries/gom/default.nix | 4 +- pkgs/development/libraries/goocanvas/2.x.nix | 4 +- pkgs/development/libraries/goocanvas/default.nix | 4 +- pkgs/development/libraries/goocanvasmm/default.nix | 4 +- pkgs/development/libraries/gpgme/default.nix | 4 +- pkgs/development/libraries/grail/default.nix | 4 +- pkgs/development/libraries/graphene/default.nix | 4 +- .../libraries/grilo-plugins/default.nix | 4 +- pkgs/development/libraries/grilo/default.nix | 4 +- .../gsettings-desktop-schemas/default.nix | 4 +- .../development/libraries/gsettings-qt/default.nix | 4 +- pkgs/development/libraries/gsignond/default.nix | 4 +- .../libraries/gsignond/plugins/lastfm.nix | 4 +- .../libraries/gsignond/plugins/mail.nix | 4 +- .../libraries/gsignond/plugins/oauth.nix | 4 +- .../libraries/gsignond/plugins/sasl.nix | 4 +- pkgs/development/libraries/gsound/default.nix | 4 +- pkgs/development/libraries/gspell/default.nix | 6 +- pkgs/development/libraries/gssdp/default.nix | 4 +- .../libraries/gstreamer/bad/default.nix | 4 +- .../libraries/gstreamer/base/default.nix | 4 +- .../libraries/gstreamer/core/default.nix | 6 +- .../libraries/gstreamer/devtools/default.nix | 4 +- .../libraries/gstreamer/ges/default.nix | 4 +- .../libraries/gstreamer/good/default.nix | 4 +- .../libraries/gstreamer/gstreamermm/default.nix | 4 +- .../libraries/gstreamer/libav/default.nix | 4 +- .../libraries/gstreamer/rtsp-server/default.nix | 4 +- .../libraries/gstreamer/ugly/default.nix | 4 +- .../libraries/gstreamer/vaapi/default.nix | 4 +- pkgs/development/libraries/gtdialog/default.nix | 4 +- .../libraries/gtk-engine-bluecurve/default.nix | 4 +- .../libraries/gtk-engine-murrine/default.nix | 4 +- pkgs/development/libraries/gtk-engines/default.nix | 4 +- .../libraries/gtk-mac-integration/default.nix | 4 +- .../libraries/gtk-sharp-beans/default.nix | 4 +- pkgs/development/libraries/gtk-sharp/2.0.nix | 4 +- pkgs/development/libraries/gtk-sharp/3.0.nix | 4 +- pkgs/development/libraries/gtk/2.x.nix | 4 +- pkgs/development/libraries/gtk/3.x.nix | 4 +- pkgs/development/libraries/gtkd/default.nix | 6 +- pkgs/development/libraries/gtkdatabox/default.nix | 4 +- .../development/libraries/gtkimageview/default.nix | 4 +- pkgs/development/libraries/gtkmathview/default.nix | 4 +- pkgs/development/libraries/gtkmm/2.x.nix | 4 +- pkgs/development/libraries/gtkmm/3.x.nix | 4 +- pkgs/development/libraries/gtksourceview/3.x.nix | 4 +- pkgs/development/libraries/gtksourceview/4.x.nix | 4 +- pkgs/development/libraries/gtksourceviewmm/4.x.nix | 4 +- .../libraries/gtksourceviewmm/default.nix | 4 +- pkgs/development/libraries/gtkspell/3.nix | 4 +- pkgs/development/libraries/gtkspell/default.nix | 4 +- pkgs/development/libraries/gtkspellmm/default.nix | 4 +- pkgs/development/libraries/gts/default.nix | 4 +- pkgs/development/libraries/gupnp-av/default.nix | 4 +- pkgs/development/libraries/gupnp-dlna/default.nix | 4 +- pkgs/development/libraries/gupnp-igd/default.nix | 4 +- pkgs/development/libraries/gupnp/default.nix | 4 +- pkgs/development/libraries/gusb/default.nix | 4 +- pkgs/development/libraries/gvfs/default.nix | 4 +- pkgs/development/libraries/hamlib/default.nix | 4 +- pkgs/development/libraries/harfbuzz/default.nix | 4 +- pkgs/development/libraries/hidapi/default.nix | 4 +- pkgs/development/libraries/hivex/default.nix | 4 +- pkgs/development/libraries/hwloc/default.nix | 4 +- pkgs/development/libraries/hyena/default.nix | 4 +- pkgs/development/libraries/hyperscan/default.nix | 4 +- pkgs/development/libraries/igraph/default.nix | 4 +- pkgs/development/libraries/iksemel/default.nix | 4 +- pkgs/development/libraries/ilixi/default.nix | 4 +- pkgs/development/libraries/imlib2/default.nix | 4 +- .../libraries/indicator-application/gtk2.nix | 4 +- .../libraries/indicator-application/gtk3.nix | 4 +- .../libraries/intel-media-sdk/default.nix | 4 +- pkgs/development/libraries/itk/default.nix | 4 +- pkgs/development/libraries/java/swt/default.nix | 4 +- pkgs/development/libraries/jose/default.nix | 4 +- pkgs/development/libraries/json-glib/default.nix | 4 +- .../development/libraries/jsonrpc-glib/default.nix | 4 +- .../kde-frameworks/extra-cmake-modules/default.nix | 4 +- pkgs/development/libraries/kerberos/heimdal.nix | 4 +- pkgs/development/libraries/kerberos/krb5.nix | 4 +- pkgs/development/libraries/keybinder/default.nix | 4 +- pkgs/development/libraries/keybinder3/default.nix | 4 +- pkgs/development/libraries/kmsxx/default.nix | 4 +- .../libraries/languagemachines/frog.nix | 4 +- .../libraries/languagemachines/frogdata.nix | 4 +- .../libraries/languagemachines/libfolia.nix | 4 +- .../development/libraries/languagemachines/mbt.nix | 4 +- .../libraries/languagemachines/ticcutils.nix | 4 +- .../libraries/languagemachines/timbl.nix | 4 +- .../libraries/languagemachines/timblserver.nix | 4 +- .../libraries/languagemachines/ucto.nix | 4 +- .../libraries/languagemachines/uctodata.nix | 4 +- pkgs/development/libraries/lasem/default.nix | 4 +- pkgs/development/libraries/lasso/default.nix | 4 +- pkgs/development/libraries/leptonica/default.nix | 4 +- pkgs/development/libraries/libabigail/default.nix | 4 +- pkgs/development/libraries/libabw/default.nix | 4 +- .../libraries/libaccounts-glib/default.nix | 4 +- pkgs/development/libraries/libagar/default.nix | 4 +- pkgs/development/libraries/libao/default.nix | 4 +- pkgs/development/libraries/libaom/default.nix | 4 +- pkgs/development/libraries/libaosd/default.nix | 4 +- .../libraries/libappindicator/default.nix | 4 +- pkgs/development/libraries/libarchive/default.nix | 6 +- pkgs/development/libraries/libass/default.nix | 4 +- pkgs/development/libraries/libast/default.nix | 4 +- .../development/libraries/libaudclient/default.nix | 4 +- pkgs/development/libraries/libav/default.nix | 4 +- pkgs/development/libraries/libavc1394/default.nix | 4 +- pkgs/development/libraries/libblockdev/default.nix | 4 +- pkgs/development/libraries/libbluray/default.nix | 4 +- pkgs/development/libraries/libbytesize/default.nix | 4 +- pkgs/development/libraries/libcaca/default.nix | 4 +- pkgs/development/libraries/libcacard/default.nix | 4 +- pkgs/development/libraries/libcanberra/default.nix | 4 +- pkgs/development/libraries/libcangjie/default.nix | 4 +- .../libraries/libcdio-paranoia/default.nix | 4 +- pkgs/development/libraries/libcdio/default.nix | 4 +- pkgs/development/libraries/libcdr/default.nix | 4 +- pkgs/development/libraries/libcec/default.nix | 4 +- .../development/libraries/libchamplain/default.nix | 4 +- pkgs/development/libraries/libchop/default.nix | 4 +- .../libraries/libcloudproviders/default.nix | 4 +- .../development/libraries/libclxclient/default.nix | 4 +- pkgs/development/libraries/libcmis/default.nix | 4 +- .../libraries/libco-canonical/default.nix | 4 +- .../development/libraries/libcouchbase/default.nix | 4 +- pkgs/development/libraries/libcryptui/default.nix | 4 +- pkgs/development/libraries/libdazzle/default.nix | 4 +- pkgs/development/libraries/libdbusmenu/default.nix | 4 +- pkgs/development/libraries/libde265/default.nix | 4 +- pkgs/development/libraries/libdevil/default.nix | 4 +- .../development/libraries/libdigidocpp/default.nix | 4 +- pkgs/development/libraries/libdiscid/default.nix | 4 +- pkgs/development/libraries/libdmtx/default.nix | 4 +- pkgs/development/libraries/libdrm/default.nix | 4 +- pkgs/development/libraries/libdvdnav/4.2.1.nix | 4 +- pkgs/development/libraries/libdvdnav/default.nix | 4 +- pkgs/development/libraries/libe-book/default.nix | 4 +- pkgs/development/libraries/libebml/default.nix | 4 +- pkgs/development/libraries/libee/default.nix | 4 +- pkgs/development/libraries/libepc/default.nix | 4 +- .../development/libraries/libevdevplus/default.nix | 4 +- pkgs/development/libraries/libewf/default.nix | 4 +- .../development/libraries/libextractor/default.nix | 4 +- pkgs/development/libraries/libfakekey/default.nix | 4 +- pkgs/development/libraries/libfido2/default.nix | 4 +- .../development/libraries/libfilezilla/default.nix | 4 +- .../development/libraries/libfishsound/default.nix | 4 +- pkgs/development/libraries/libfive/default.nix | 4 +- pkgs/development/libraries/libfixposix/default.nix | 4 +- pkgs/development/libraries/libfm/default.nix | 4 +- pkgs/development/libraries/libfprint/default.nix | 4 +- pkgs/development/libraries/libfreefare/default.nix | 4 +- pkgs/development/libraries/libfsm/default.nix | 2 +- pkgs/development/libraries/libftdi/1.x.nix | 4 +- .../libraries/libgaminggear/default.nix | 4 +- pkgs/development/libraries/libgdamm/default.nix | 4 +- pkgs/development/libraries/libgdata/default.nix | 4 +- pkgs/development/libraries/libgdiplus/default.nix | 4 +- pkgs/development/libraries/libgee/default.nix | 4 +- pkgs/development/libraries/libgepub/default.nix | 4 +- pkgs/development/libraries/libgig/default.nix | 4 +- .../development/libraries/libgit2-glib/default.nix | 4 +- pkgs/development/libraries/libgksu/default.nix | 4 +- pkgs/development/libraries/libglvnd/default.nix | 4 +- .../libraries/libgnome-keyring/default.nix | 4 +- pkgs/development/libraries/libgnomekbd/default.nix | 4 +- pkgs/development/libraries/libgnurl/default.nix | 4 +- pkgs/development/libraries/libgphoto2/default.nix | 4 +- pkgs/development/libraries/libgpiod/default.nix | 4 +- .../development/libraries/libgringotts/default.nix | 4 +- pkgs/development/libraries/libgrss/default.nix | 4 +- pkgs/development/libraries/libgsf/default.nix | 4 +- pkgs/development/libraries/libgtop/default.nix | 4 +- pkgs/development/libraries/libgudev/default.nix | 4 +- pkgs/development/libraries/libguestfs/default.nix | 4 +- pkgs/development/libraries/libgweather/default.nix | 4 +- pkgs/development/libraries/libgxps/default.nix | 4 +- pkgs/development/libraries/libhandy/0.x.nix | 4 +- pkgs/development/libraries/libhandy/default.nix | 6 +- pkgs/development/libraries/libheif/default.nix | 4 +- .../libraries/libhttpseverywhere/default.nix | 4 +- pkgs/development/libraries/libical/default.nix | 4 +- pkgs/development/libraries/libiec61883/default.nix | 4 +- .../libraries/libimobiledevice/default.nix | 4 +- .../development/libraries/libindicator/default.nix | 4 +- pkgs/development/libraries/libinfinity/default.nix | 4 +- pkgs/development/libraries/libinput/default.nix | 4 +- pkgs/development/libraries/libiodbc/default.nix | 4 +- .../development/libraries/libirecovery/default.nix | 4 +- pkgs/development/libraries/libite/default.nix | 4 +- pkgs/development/libraries/libivykis/default.nix | 4 +- pkgs/development/libraries/liblangtag/default.nix | 4 +- pkgs/development/libraries/liblastfm/default.nix | 4 +- pkgs/development/libraries/liblastfmSF/default.nix | 4 +- pkgs/development/libraries/liblcf/default.nix | 4 +- pkgs/development/libraries/liblinphone/default.nix | 4 +- pkgs/development/libraries/liblogging/default.nix | 4 +- pkgs/development/libraries/liblognorm/default.nix | 4 +- pkgs/development/libraries/liblouis/default.nix | 4 +- pkgs/development/libraries/liblqr-1/default.nix | 4 +- pkgs/development/libraries/liblscp/default.nix | 4 +- pkgs/development/libraries/libmanette/default.nix | 4 +- pkgs/development/libraries/libmatheval/default.nix | 4 +- pkgs/development/libraries/libmatroska/default.nix | 4 +- pkgs/development/libraries/libmediaart/default.nix | 4 +- .../development/libraries/libmediainfo/default.nix | 4 +- pkgs/development/libraries/libmicrodns/default.nix | 4 +- .../libraries/libmicrohttpd/generic.nix | 4 +- pkgs/development/libraries/libmms/default.nix | 4 +- pkgs/development/libraries/libmodule/default.nix | 4 +- .../libraries/libmongo-client/default.nix | 4 +- pkgs/development/libraries/libmrss/default.nix | 4 +- pkgs/development/libraries/libmtp/default.nix | 4 +- pkgs/development/libraries/libmwaw/default.nix | 4 +- pkgs/development/libraries/libmx/default.nix | 4 +- pkgs/development/libraries/libmypaint/default.nix | 4 +- pkgs/development/libraries/libndctl/default.nix | 4 +- .../libraries/libnetfilter_acct/default.nix | 4 +- .../libraries/libnetfilter_conntrack/default.nix | 4 +- .../libraries/libnetfilter_cthelper/default.nix | 4 +- .../libraries/libnetfilter_cttimeout/default.nix | 4 +- .../libraries/libnetfilter_log/default.nix | 4 +- .../libraries/libnetfilter_queue/default.nix | 4 +- pkgs/development/libraries/libnftnl/default.nix | 4 +- pkgs/development/libraries/libnice/default.nix | 4 +- pkgs/development/libraries/libnih/default.nix | 4 +- pkgs/development/libraries/libnixxml/default.nix | 4 +- pkgs/development/libraries/libnotify/default.nix | 4 +- pkgs/development/libraries/libnsl/default.nix | 4 +- pkgs/development/libraries/liboauth/default.nix | 4 +- pkgs/development/libraries/libodfgen/default.nix | 4 +- pkgs/development/libraries/libofx/default.nix | 4 +- pkgs/development/libraries/liboggz/default.nix | 4 +- pkgs/development/libraries/liboil/default.nix | 4 +- pkgs/development/libraries/libopusenc/default.nix | 4 +- pkgs/development/libraries/libosinfo/default.nix | 4 +- pkgs/development/libraries/libow/default.nix | 4 +- pkgs/development/libraries/libp11/default.nix | 4 +- pkgs/development/libraries/libpar2/default.nix | 4 +- pkgs/development/libraries/libpcap/default.nix | 4 +- pkgs/development/libraries/libpeas/default.nix | 4 +- .../libraries/libphonenumber/default.nix | 4 +- pkgs/development/libraries/libpinyin/default.nix | 4 +- pkgs/development/libraries/libplist/default.nix | 4 +- pkgs/development/libraries/libportal/default.nix | 4 +- pkgs/development/libraries/libproxy/default.nix | 4 +- pkgs/development/libraries/libpseudo/default.nix | 4 +- pkgs/development/libraries/libpsl/default.nix | 4 +- pkgs/development/libraries/libpst/default.nix | 4 +- .../development/libraries/libqalculate/default.nix | 4 +- pkgs/development/libraries/libqb/default.nix | 4 +- pkgs/development/libraries/libr3/default.nix | 4 +- pkgs/development/libraries/libraw/default.nix | 4 +- pkgs/development/libraries/librdf/rasqal.nix | 4 +- pkgs/development/libraries/librdf/redland.nix | 4 +- pkgs/development/libraries/librelp/default.nix | 4 +- pkgs/development/libraries/librep/default.nix | 4 +- pkgs/development/libraries/librest/default.nix | 4 +- pkgs/development/libraries/librevenge/default.nix | 4 +- pkgs/development/libraries/librevisa/default.nix | 4 +- pkgs/development/libraries/librsvg/default.nix | 4 +- .../libraries/libsamplerate/default.nix | 4 +- pkgs/development/libraries/libsearpc/default.nix | 4 +- pkgs/development/libraries/libsecret/default.nix | 4 +- .../libraries/libserialport/default.nix | 4 +- pkgs/development/libraries/libshout/default.nix | 6 +- .../development/libraries/libsidplayfp/default.nix | 4 +- pkgs/development/libraries/libsigcxx/1.2.nix | 4 +- pkgs/development/libraries/libsigcxx/default.nix | 4 +- .../libraries/libsignon-glib/default.nix | 4 +- pkgs/development/libraries/libskk/default.nix | 4 +- .../development/libraries/libsmartcols/default.nix | 4 +- pkgs/development/libraries/libsndfile/default.nix | 4 +- pkgs/development/libraries/libsoup/default.nix | 4 +- .../libraries/libspatialite/default.nix | 4 +- pkgs/development/libraries/libspectre/default.nix | 4 +- pkgs/development/libraries/libspectrum/default.nix | 4 +- pkgs/development/libraries/libspiro/default.nix | 4 +- pkgs/development/libraries/libspotify/default.nix | 4 +- pkgs/development/libraries/libssh/default.nix | 4 +- pkgs/development/libraries/libtap/default.nix | 4 +- pkgs/development/libraries/libtelnet/default.nix | 4 +- pkgs/development/libraries/libtermkey/default.nix | 4 +- pkgs/development/libraries/libtheora/default.nix | 4 +- pkgs/development/libraries/libtiff/default.nix | 4 +- pkgs/development/libraries/libtiger/default.nix | 4 +- .../libraries/libtorrent-rasterbar/1.1.nix | 4 +- pkgs/development/libraries/libtoxcore/default.nix | 4 +- pkgs/development/libraries/libtoxcore/new-api.nix | 4 +- pkgs/development/libraries/libtsm/default.nix | 4 +- pkgs/development/libraries/libu2f-host/default.nix | 4 +- .../libraries/libu2f-server/default.nix | 4 +- pkgs/development/libraries/libubox/default.nix | 4 +- pkgs/development/libraries/libui/default.nix | 4 +- .../libraries/libuinputplus/default.nix | 4 +- pkgs/development/libraries/libunique/3.x.nix | 4 +- pkgs/development/libraries/libunique/default.nix | 4 +- pkgs/development/libraries/libunity/default.nix | 4 +- pkgs/development/libraries/libusb-compat/0.1.nix | 4 +- pkgs/development/libraries/libusb1/default.nix | 4 +- pkgs/development/libraries/libusbmuxd/default.nix | 4 +- pkgs/development/libraries/libuv/default.nix | 4 +- pkgs/development/libraries/libva/1.0.0.nix | 4 +- .../libraries/libvdpau-va-gl/default.nix | 4 +- pkgs/development/libraries/libvdpau/default.nix | 4 +- pkgs/development/libraries/libviper/default.nix | 4 +- .../development/libraries/libvirt-glib/default.nix | 4 +- pkgs/development/libraries/libvirt/5.9.0.nix | 4 +- pkgs/development/libraries/libvisio/default.nix | 4 +- pkgs/development/libraries/libvisual/default.nix | 4 +- pkgs/development/libraries/libvmi/default.nix | 4 +- pkgs/development/libraries/libvorbis/default.nix | 4 +- pkgs/development/libraries/libvterm/default.nix | 4 +- pkgs/development/libraries/libwacom/default.nix | 4 +- pkgs/development/libraries/libwmf/default.nix | 4 +- pkgs/development/libraries/libwnck/3.x.nix | 4 +- pkgs/development/libraries/libwnck/default.nix | 4 +- pkgs/development/libraries/libwpd/0.8.nix | 4 +- pkgs/development/libraries/libwpd/default.nix | 4 +- pkgs/development/libraries/libwpg/default.nix | 4 +- pkgs/development/libraries/libwps/default.nix | 4 +- pkgs/development/libraries/libxcomp/default.nix | 4 +- .../libraries/libxkbcommon/libxkbcommon_7.nix | 4 +- pkgs/development/libraries/libxklavier/default.nix | 4 +- pkgs/development/libraries/libxmlb/default.nix | 4 +- pkgs/development/libraries/libxmlxx/default.nix | 4 +- pkgs/development/libraries/libxmlxx/v3.nix | 4 +- pkgs/development/libraries/libykclient/default.nix | 4 +- pkgs/development/libraries/libykneomgr/default.nix | 4 +- pkgs/development/libraries/libzapojit/default.nix | 4 +- pkgs/development/libraries/libzip/default.nix | 2 +- pkgs/development/libraries/libzmf/default.nix | 4 +- .../libraries/lightstep-tracer-cpp/default.nix | 4 +- pkgs/development/libraries/linbox/default.nix | 4 +- pkgs/development/libraries/lirc/default.nix | 4 +- pkgs/development/libraries/loudmouth/default.nix | 4 +- pkgs/development/libraries/lrdf/default.nix | 4 +- pkgs/development/libraries/luksmeta/default.nix | 4 +- .../libraries/mediastreamer/default.nix | 4 +- .../libraries/mediastreamer/msopenh264.nix | 4 +- pkgs/development/libraries/menu-cache/default.nix | 4 +- pkgs/development/libraries/mesa-glu/default.nix | 4 +- pkgs/development/libraries/mesa/default.nix | 6 +- pkgs/development/libraries/mlt/default.nix | 4 +- pkgs/development/libraries/mlt/qt-5.nix | 4 +- pkgs/development/libraries/mongoc/default.nix | 4 +- pkgs/development/libraries/mono-addins/default.nix | 4 +- pkgs/development/libraries/motif/default.nix | 4 +- pkgs/development/libraries/movit/default.nix | 4 +- pkgs/development/libraries/msgpuck/default.nix | 4 +- pkgs/development/libraries/msilbc/default.nix | 4 +- pkgs/development/libraries/mtxclient/default.nix | 4 +- pkgs/development/libraries/mumlib/default.nix | 4 +- pkgs/development/libraries/mypaint-brushes/1.0.nix | 4 +- .../libraries/mypaint-brushes/default.nix | 4 +- pkgs/development/libraries/mythes/default.nix | 4 +- pkgs/development/libraries/ncurses/default.nix | 4 +- pkgs/development/libraries/neardal/default.nix | 4 +- pkgs/development/libraries/neon/0.29.nix | 4 +- pkgs/development/libraries/neon/default.nix | 4 +- pkgs/development/libraries/nghttp2/default.nix | 4 +- pkgs/development/libraries/nix-plugins/default.nix | 4 +- pkgs/development/libraries/notcurses/default.nix | 4 +- .../development/libraries/notify-sharp/default.nix | 4 +- pkgs/development/libraries/ntrack/default.nix | 4 +- pkgs/development/libraries/nuspell/default.nix | 4 +- pkgs/development/libraries/ogrepaged/default.nix | 4 +- pkgs/development/libraries/opencascade/default.nix | 4 +- pkgs/development/libraries/opencolorio/default.nix | 4 +- pkgs/development/libraries/openct/default.nix | 4 +- pkgs/development/libraries/opencv/3.x.nix | 4 +- pkgs/development/libraries/opencv/4.x.nix | 4 +- pkgs/development/libraries/opencv/default.nix | 6 +- pkgs/development/libraries/opendkim/default.nix | 4 +- pkgs/development/libraries/openjpeg/generic.nix | 4 +- .../development/libraries/opensaml-cpp/default.nix | 4 +- .../libraries/openscenegraph/default.nix | 4 +- pkgs/development/libraries/openwsman/default.nix | 4 +- pkgs/development/libraries/openzwave/default.nix | 6 +- pkgs/development/libraries/osm-gps-map/default.nix | 4 +- pkgs/development/libraries/p11-kit/default.nix | 4 +- pkgs/development/libraries/pango/default.nix | 4 +- pkgs/development/libraries/pangolin/default.nix | 4 +- pkgs/development/libraries/pangomm/default.nix | 4 +- pkgs/development/libraries/pangoxsl/default.nix | 4 +- pkgs/development/libraries/pcaudiolib/default.nix | 4 +- pkgs/development/libraries/pcl/default.nix | 4 +- pkgs/development/libraries/phash/default.nix | 4 +- .../libraries/phonon/backends/gstreamer.nix | 6 +- pkgs/development/libraries/phonon/backends/vlc.nix | 4 +- pkgs/development/libraries/phonon/default.nix | 4 +- pkgs/development/libraries/pipewire/0.2.nix | 4 +- pkgs/development/libraries/pipewire/default.nix | 4 +- pkgs/development/libraries/pixman/default.nix | 4 +- .../development/libraries/pkcs11helper/default.nix | 4 +- pkgs/development/libraries/pmdk/default.nix | 4 +- .../development/libraries/pocketsphinx/default.nix | 4 +- pkgs/development/libraries/poco/default.nix | 4 +- pkgs/development/libraries/podofo/default.nix | 4 +- pkgs/development/libraries/polkit-qt-1/qt-4.nix | 4 +- pkgs/development/libraries/polkit-qt-1/qt-5.nix | 4 +- pkgs/development/libraries/polkit/default.nix | 4 +- pkgs/development/libraries/poly2tri-c/default.nix | 4 +- pkgs/development/libraries/poppler/0.61.nix | 4 +- pkgs/development/libraries/poppler/default.nix | 4 +- pkgs/development/libraries/portaudio/default.nix | 4 +- pkgs/development/libraries/protobufc/generic.nix | 4 +- pkgs/development/libraries/pslib/default.nix | 4 +- pkgs/development/libraries/qca-qt5/default.nix | 4 +- pkgs/development/libraries/qca2/default.nix | 4 +- .../libraries/qgnomeplatform/default.nix | 4 +- pkgs/development/libraries/qrencode/default.nix | 4 +- pkgs/development/libraries/qt-4.x/4.8/default.nix | 4 +- pkgs/development/libraries/qt-5/modules/qtbase.nix | 4 +- .../libraries/qt-5/modules/qtgamepad.nix | 4 +- .../libraries/qt-5/modules/qtmultimedia.nix | 4 +- .../libraries/qt-5/modules/qtwayland.nix | 4 +- .../libraries/qt-5/modules/qtwebengine.nix | 4 +- .../libraries/qt-5/modules/qtwebkit.nix | 4 +- pkgs/development/libraries/qtkeychain/default.nix | 4 +- .../libraries/qtstyleplugins/default.nix | 4 +- pkgs/development/libraries/qtutilities/default.nix | 2 +- .../libraries/raft-canonical/default.nix | 4 +- pkgs/development/libraries/rapidjson/default.nix | 4 +- pkgs/development/libraries/rarian/default.nix | 4 +- pkgs/development/libraries/rdkafka/default.nix | 4 +- pkgs/development/libraries/rep-gtk/default.nix | 4 +- .../libraries/resolv_wrapper/default.nix | 4 +- pkgs/development/libraries/rubberband/default.nix | 4 +- pkgs/development/libraries/sbc/default.nix | 4 +- .../development/libraries/schroedinger/default.nix | 4 +- .../libraries/science/math/blas/default.nix | 2 +- .../libraries/science/math/brial/default.nix | 4 +- .../libraries/science/math/fenics/default.nix | 4 +- .../libraries/science/math/osi/default.nix | 4 +- .../libraries/science/math/tensorflow/bin.nix | 2 +- pkgs/development/libraries/serd/default.nix | 4 +- pkgs/development/libraries/serf/default.nix | 4 +- .../libraries/shibboleth-sp/default.nix | 4 +- pkgs/development/libraries/silgraphite/default.nix | 4 +- .../libraries/silgraphite/graphite2.nix | 4 +- pkgs/development/libraries/smpeg/default.nix | 6 +- pkgs/development/libraries/snack/default.nix | 4 +- .../libraries/socket_wrapper/default.nix | 4 +- pkgs/development/libraries/sofia-sip/default.nix | 4 +- pkgs/development/libraries/soprano/default.nix | 4 +- pkgs/development/libraries/soqt/default.nix | 4 +- pkgs/development/libraries/sord/default.nix | 4 +- .../libraries/spatialite-tools/default.nix | 4 +- pkgs/development/libraries/speechd/default.nix | 4 +- pkgs/development/libraries/speex/default.nix | 4 +- pkgs/development/libraries/speexdsp/default.nix | 4 +- pkgs/development/libraries/sphinxbase/default.nix | 4 +- pkgs/development/libraries/spice-gtk/default.nix | 4 +- pkgs/development/libraries/spice/default.nix | 4 +- pkgs/development/libraries/srtp/default.nix | 4 +- .../libraries/startup-notification/default.nix | 4 +- pkgs/development/libraries/subunit/default.nix | 4 +- pkgs/development/libraries/svrcore/default.nix | 4 +- pkgs/development/libraries/sword/default.nix | 4 +- .../development/libraries/taglib-sharp/default.nix | 4 +- .../libraries/telepathy/farstream/default.nix | 4 +- .../libraries/telepathy/glib/default.nix | 4 +- .../development/libraries/telepathy/qt/default.nix | 4 +- .../libraries/template-glib/default.nix | 4 +- pkgs/development/libraries/thrift/0.10.nix | 4 +- pkgs/development/libraries/thrift/default.nix | 4 +- pkgs/development/libraries/timezonemap/default.nix | 4 +- pkgs/development/libraries/tinyxml/2.6.2.nix | 2 +- pkgs/development/libraries/tk/generic.nix | 4 +- .../development/libraries/tokyo-tyrant/default.nix | 4 +- .../libraries/totem-pl-parser/default.nix | 4 +- .../libraries/tracker-miners/default.nix | 4 +- pkgs/development/libraries/tracker/default.nix | 6 +- pkgs/development/libraries/tremor/default.nix | 4 +- pkgs/development/libraries/twolame/default.nix | 4 +- pkgs/development/libraries/uci/default.nix | 4 +- pkgs/development/libraries/ucommon/default.nix | 4 +- pkgs/development/libraries/uhttpmock/default.nix | 4 +- pkgs/development/libraries/uid_wrapper/default.nix | 4 +- pkgs/development/libraries/unibilium/default.nix | 4 +- pkgs/development/libraries/unicorn/default.nix | 4 +- pkgs/development/libraries/usbredir/default.nix | 4 +- pkgs/development/libraries/v8/default.nix | 4 +- pkgs/development/libraries/v8/plv8_6_x.nix | 4 +- .../libraries/vaapi-intel-hybrid/default.nix | 4 +- pkgs/development/libraries/vaapi-vdpau/default.nix | 4 +- .../libraries/vapoursynth-mvtools/default.nix | 4 +- pkgs/development/libraries/vapoursynth/default.nix | 4 +- pkgs/development/libraries/vcdimager/default.nix | 4 +- .../libraries/virglrenderer/default.nix | 4 +- pkgs/development/libraries/vmime/default.nix | 4 +- pkgs/development/libraries/vmmlib/default.nix | 4 +- pkgs/development/libraries/volume-key/default.nix | 4 +- pkgs/development/libraries/vte/2.90.nix | 4 +- pkgs/development/libraries/vte/default.nix | 4 +- .../libraries/vulkan-loader/default.nix | 4 +- pkgs/development/libraries/wayland/default.nix | 6 +- pkgs/development/libraries/wayland/protocols.nix | 4 +- pkgs/development/libraries/waylandpp/default.nix | 4 +- pkgs/development/libraries/webkitgtk/default.nix | 4 +- pkgs/development/libraries/wxSVG/default.nix | 4 +- .../libraries/wxwidgets/2.8/default.nix | 4 +- .../libraries/wxwidgets/2.9/default.nix | 4 +- .../libraries/wxwidgets/3.0/default.nix | 4 +- .../libraries/wxwidgets/3.1/default.nix | 4 +- .../libraries/xapian/tools/omega/default.nix | 4 +- .../development/libraries/xcb-util-cursor/HEAD.nix | 4 +- .../libraries/xdg-dbus-proxy/default.nix | 4 +- .../libraries/xdg-desktop-portal-wlr/default.nix | 4 +- .../libraries/xdg-desktop-portal/default.nix | 4 +- pkgs/development/libraries/xine-lib/default.nix | 4 +- .../libraries/xml-security-c/default.nix | 4 +- .../libraries/xml-tooling-c/default.nix | 4 +- pkgs/development/libraries/xmlsec/default.nix | 6 +- pkgs/development/libraries/yubico-pam/default.nix | 4 +- pkgs/development/libraries/zchunk/default.nix | 4 +- pkgs/development/libraries/zeitgeist/default.nix | 4 +- pkgs/development/libraries/zmqpp/default.nix | 4 +- pkgs/development/lua-modules/overrides.nix | 2 +- pkgs/development/misc/yelp-tools/default.nix | 4 +- pkgs/development/mobile/adbfs-rootless/default.nix | 4 +- pkgs/development/mobile/webos/novacom.nix | 4 +- pkgs/development/mobile/webos/novacomd.nix | 4 +- pkgs/development/node-packages/default.nix | 2 +- pkgs/development/ocaml-modules/cairo2/default.nix | 4 +- pkgs/development/ocaml-modules/ctypes/default.nix | 4 +- .../ocaml-modules/fontconfig/default.nix | 4 +- .../development/ocaml-modules/gmetadom/default.nix | 4 +- pkgs/development/ocaml-modules/lablgtk/2.14.0.nix | 4 +- pkgs/development/ocaml-modules/lablgtk/default.nix | 4 +- .../development/ocaml-modules/lablgtk3/default.nix | 4 +- pkgs/development/ocaml-modules/lwt/default.nix | 4 +- pkgs/development/ocaml-modules/magick/default.nix | 4 +- .../ocaml-modules/ocaml-cairo/default.nix | 4 +- .../development/ocaml-modules/ocamlnet/default.nix | 4 +- .../development/ocaml-modules/ocamlsdl/default.nix | 6 +- pkgs/development/ocaml-modules/ocurl/default.nix | 4 +- pkgs/development/ocaml-modules/sqlite3/default.nix | 4 +- pkgs/development/ocaml-modules/tsdl/default.nix | 4 +- pkgs/development/ocaml-modules/zarith/default.nix | 4 +- pkgs/development/php-packages/event/default.nix | 2 +- pkgs/development/php-packages/imagick/default.nix | 2 +- .../development/php-packages/memcached/default.nix | 2 +- pkgs/development/php-packages/mongodb/default.nix | 2 +- pkgs/development/php-packages/yaml/default.nix | 2 +- pkgs/development/pure-modules/audio/default.nix | 4 +- pkgs/development/pure-modules/avahi/default.nix | 4 +- pkgs/development/pure-modules/csv/default.nix | 4 +- pkgs/development/pure-modules/doc/default.nix | 4 +- pkgs/development/pure-modules/fastcgi/default.nix | 4 +- pkgs/development/pure-modules/faust/default.nix | 4 +- pkgs/development/pure-modules/ffi/default.nix | 4 +- pkgs/development/pure-modules/gen/default.nix | 4 +- pkgs/development/pure-modules/gl/default.nix | 4 +- pkgs/development/pure-modules/glpk/default.nix | 4 +- pkgs/development/pure-modules/gplot/default.nix | 4 +- pkgs/development/pure-modules/gsl/default.nix | 4 +- pkgs/development/pure-modules/gtk/default.nix | 4 +- pkgs/development/pure-modules/liblo/default.nix | 4 +- pkgs/development/pure-modules/lilv/default.nix | 4 +- pkgs/development/pure-modules/lv2/default.nix | 4 +- pkgs/development/pure-modules/midi/default.nix | 4 +- pkgs/development/pure-modules/mpfr/default.nix | 4 +- pkgs/development/pure-modules/octave/default.nix | 4 +- pkgs/development/pure-modules/odbc/default.nix | 4 +- pkgs/development/pure-modules/pandoc/default.nix | 4 +- pkgs/development/pure-modules/rational/default.nix | 4 +- pkgs/development/pure-modules/readline/default.nix | 4 +- pkgs/development/pure-modules/sockets/default.nix | 4 +- pkgs/development/pure-modules/sql3/default.nix | 4 +- pkgs/development/pure-modules/stldict/default.nix | 4 +- pkgs/development/pure-modules/stllib/default.nix | 4 +- pkgs/development/pure-modules/tk/default.nix | 4 +- pkgs/development/pure-modules/xml/default.nix | 4 +- pkgs/development/python-modules/av/default.nix | 4 +- pkgs/development/python-modules/dbus/default.nix | 4 +- .../python-modules/fuse-python/default.nix | 4 +- .../python-modules/goocalendar/default.nix | 4 +- .../development/python-modules/gphoto2/default.nix | 4 +- .../python-modules/gst-python/default.nix | 4 +- .../python-modules/html5-parser/default.nix | 4 +- pkgs/development/python-modules/imread/default.nix | 4 +- .../python-modules/libasyncns/default.nix | 4 +- .../python-modules/libversion/default.nix | 4 +- pkgs/development/python-modules/libvirt/5.9.0.nix | 4 +- .../development/python-modules/libvirt/default.nix | 4 +- pkgs/development/python-modules/llfuse/default.nix | 4 +- pkgs/development/python-modules/matplotlib/2.nix | 4 +- .../python-modules/matplotlib/default.nix | 4 +- .../python-modules/poppler-qt5/default.nix | 4 +- .../development/python-modules/pyarrow/default.nix | 4 +- .../development/python-modules/pyatspi/default.nix | 4 +- .../python-modules/pycangjie/default.nix | 4 +- pkgs/development/python-modules/pygobject/3.36.nix | 4 +- pkgs/development/python-modules/pygobject/3.nix | 4 +- .../python-modules/pygobject/default.nix | 4 +- .../python-modules/pygraphviz/default.nix | 4 +- pkgs/development/python-modules/pygtk/default.nix | 4 +- .../python-modules/pygtksourceview/default.nix | 4 +- pkgs/development/python-modules/pyqt/4.x.nix | 4 +- pkgs/development/python-modules/pyqt/5.x.nix | 4 +- .../python-modules/pyqtwebengine/default.nix | 4 +- pkgs/development/python-modules/pysmbc/default.nix | 4 +- .../python-modules/python-efl/default.nix | 4 +- .../python-modules/python-igraph/default.nix | 4 +- .../python-modules/python_openzwave/default.nix | 4 +- .../python-modules/pythonnet/default.nix | 4 +- .../python-modules/roboschool/default.nix | 4 +- .../python-modules/secp256k1/default.nix | 4 +- .../python-modules/sentencepiece/default.nix | 4 +- .../python-modules/sipsimple/default.nix | 2 +- .../development/python-modules/systemd/default.nix | 4 +- .../development/python-modules/virtkey/default.nix | 4 +- pkgs/development/python-modules/wxPython/3.0.nix | 4 +- pkgs/development/python-modules/wxPython/4.0.nix | 4 +- pkgs/development/python-modules/wxPython/4.1.nix | 4 +- pkgs/development/python-modules/zstd/default.nix | 6 +- pkgs/development/r-modules/default.nix | 58 +- .../tools/analysis/cargo-tarpaulin/default.nix | 4 +- pkgs/development/tools/analysis/kcov/default.nix | 4 +- .../tools/analysis/panopticon/default.nix | 4 +- pkgs/development/tools/analysis/radare2/cutter.nix | 6 +- .../development/tools/analysis/radare2/default.nix | 4 +- pkgs/development/tools/analysis/retdec/default.nix | 4 +- pkgs/development/tools/analysis/smatch/default.nix | 4 +- pkgs/development/tools/analysis/sparse/default.nix | 4 +- .../tools/build-managers/cmake/default.nix | 4 +- .../tools/build-managers/conan/default.nix | 4 +- .../tools/build-managers/gnumake/4.2/default.nix | 6 +- .../tools/build-managers/gnumake/default.nix | 6 +- .../tools/build-managers/meson/default.nix | 2 +- .../tools/build-managers/tup/default.nix | 4 +- pkgs/development/tools/cargo-web/default.nix | 4 +- pkgs/development/tools/chit/default.nix | 4 +- pkgs/development/tools/diesel-cli/default.nix | 4 +- .../documentation/gnome-doc-utils/default.nix | 4 +- pkgs/development/tools/drm_info/default.nix | 4 +- pkgs/development/tools/flatpak-builder/default.nix | 4 +- pkgs/development/tools/fmbt/default.nix | 4 +- pkgs/development/tools/git-series/default.nix | 4 +- pkgs/development/tools/glslviewer/default.nix | 4 +- .../tools/gnome-desktop-testing/default.nix | 4 +- pkgs/development/tools/godot/default.nix | 4 +- pkgs/development/tools/guile/g-wrap/default.nix | 4 +- pkgs/development/tools/halfempty/default.nix | 4 +- pkgs/development/tools/icestorm/default.nix | 4 +- pkgs/development/tools/icr/default.nix | 4 +- pkgs/development/tools/jo/default.nix | 4 +- pkgs/development/tools/kafkacat/default.nix | 4 +- pkgs/development/tools/libsigrok/default.nix | 4 +- pkgs/development/tools/libsigrokdecode/default.nix | 4 +- pkgs/development/tools/mdk/default.nix | 4 +- pkgs/development/tools/misc/autogen/default.nix | 4 +- pkgs/development/tools/misc/awf/default.nix | 4 +- pkgs/development/tools/misc/babeltrace/default.nix | 4 +- pkgs/development/tools/misc/blackmagic/default.nix | 4 +- pkgs/development/tools/misc/bsdbuild/default.nix | 4 +- pkgs/development/tools/misc/coccinelle/default.nix | 4 +- pkgs/development/tools/misc/d-feet/default.nix | 4 +- pkgs/development/tools/misc/dfu-util/default.nix | 4 +- pkgs/development/tools/misc/distcc/default.nix | 6 +- pkgs/development/tools/misc/eggdbus/default.nix | 4 +- pkgs/development/tools/misc/fujprog/default.nix | 4 +- pkgs/development/tools/misc/gdb/default.nix | 4 +- pkgs/development/tools/misc/gob2/default.nix | 4 +- pkgs/development/tools/misc/gpshell/default.nix | 4 +- pkgs/development/tools/misc/gtkdialog/default.nix | 4 +- pkgs/development/tools/misc/gtkperf/default.nix | 4 +- pkgs/development/tools/misc/hydra-cli/default.nix | 4 +- pkgs/development/tools/misc/hydra/common.nix | 4 +- .../tools/misc/intel-gpu-tools/default.nix | 4 +- .../tools/misc/kconfig-frontends/default.nix | 4 +- .../development/tools/misc/lttng-tools/default.nix | 4 +- pkgs/development/tools/misc/lttv/default.nix | 4 +- pkgs/development/tools/misc/msitools/default.nix | 4 +- pkgs/development/tools/misc/pkg-config/default.nix | 2 +- pkgs/development/tools/misc/sccache/default.nix | 4 +- pkgs/development/tools/misc/sysbench/default.nix | 4 +- .../tools/misc/universal-ctags/default.nix | 4 +- .../tools/misc/usb-modeswitch/default.nix | 4 +- pkgs/development/tools/nemiver/default.nix | 4 +- pkgs/development/tools/ofono-phonesim/default.nix | 4 +- pkgs/development/tools/osslsigncode/default.nix | 4 +- pkgs/development/tools/parsing/antlr/4.8.nix | 4 +- pkgs/development/tools/parsing/hammer/default.nix | 4 +- .../tools/poetry2nix/poetry2nix/overrides.nix | 26 +- .../tools/profiling/oprofile/default.nix | 4 +- .../tools/profiling/sysprof/default.nix | 4 +- .../tools/profiling/systemtap/default.nix | 4 +- pkgs/development/tools/pxview/default.nix | 4 +- pkgs/development/tools/py-spy/default.nix | 2 +- pkgs/development/tools/rtags/default.nix | 4 +- pkgs/development/tools/rust/cargo-deny/default.nix | 4 +- .../tools/rust/cargo-geiger/default.nix | 4 +- .../tools/rust/cargo-generate/default.nix | 4 +- pkgs/development/tools/rust/cargo-raze/default.nix | 4 +- .../development/tools/rust/cargo-udeps/default.nix | 4 +- pkgs/development/tools/rust/maturin/default.nix | 4 +- pkgs/development/tools/rust/rustup/default.nix | 4 +- pkgs/development/tools/scaff/default.nix | 4 +- pkgs/development/tools/sigrok-cli/default.nix | 4 +- pkgs/development/tools/simavr/default.nix | 4 +- pkgs/development/tools/sunxi-tools/default.nix | 4 +- pkgs/development/tools/tracy/default.nix | 4 +- pkgs/development/tools/vala-lint/default.nix | 4 +- pkgs/development/tools/vogl/default.nix | 4 +- .../tools/vulkan-validation-layers/default.nix | 4 +- .../development/tools/wasm-bindgen-cli/default.nix | 4 +- pkgs/development/tools/wasm-pack/default.nix | 4 +- pkgs/development/tools/watchman/default.nix | 4 +- pkgs/development/web/kcgi/default.nix | 4 +- pkgs/development/web/nodejs/nodejs.nix | 6 +- pkgs/development/web/valum/default.nix | 4 +- pkgs/development/web/woff2/default.nix | 4 +- pkgs/games/0ad/game.nix | 6 +- pkgs/os-specific/linux/afuse/default.nix | 4 +- pkgs/os-specific/linux/alsa-plugins/default.nix | 4 +- pkgs/os-specific/linux/alsa-tools/default.nix | 4 +- pkgs/os-specific/linux/apparmor/default.nix | 8 +- pkgs/os-specific/linux/batman-adv/alfred.nix | 6 +- pkgs/os-specific/linux/batman-adv/batctl.nix | 6 +- pkgs/os-specific/linux/bluez/default.nix | 4 +- pkgs/os-specific/linux/bolt/default.nix | 4 +- pkgs/os-specific/linux/bpftrace/default.nix | 4 +- pkgs/os-specific/linux/btfs/default.nix | 4 +- pkgs/os-specific/linux/cifs-utils/default.nix | 4 +- pkgs/os-specific/linux/conky/default.nix | 4 +- pkgs/os-specific/linux/conntrack-tools/default.nix | 4 +- pkgs/os-specific/linux/crda/default.nix | 4 +- pkgs/os-specific/linux/criu/default.nix | 4 +- pkgs/os-specific/linux/cryptsetup/default.nix | 4 +- pkgs/os-specific/linux/dbus-broker/default.nix | 4 +- pkgs/os-specific/linux/directvnc/default.nix | 4 +- pkgs/os-specific/linux/dpdk/default.nix | 4 +- pkgs/os-specific/linux/dropwatch/default.nix | 4 +- pkgs/os-specific/linux/ell/default.nix | 4 +- pkgs/os-specific/linux/erofs-utils/default.nix | 4 +- pkgs/os-specific/linux/eudev/default.nix | 4 +- pkgs/os-specific/linux/fbterm/default.nix | 4 +- pkgs/os-specific/linux/ffado/default.nix | 4 +- .../linux/firmware/firmware-manager/default.nix | 4 +- .../linux/firmware/raspberrypi/armstubs.nix | 2 +- .../linux/firmware/system76-firmware/default.nix | 4 +- pkgs/os-specific/linux/fwts/default.nix | 4 +- pkgs/os-specific/linux/guvcview/default.nix | 4 +- pkgs/os-specific/linux/hal-flash/default.nix | 4 +- pkgs/os-specific/linux/hostapd/default.nix | 4 +- .../os-specific/linux/iio-sensor-proxy/default.nix | 4 +- pkgs/os-specific/linux/ima-evm-utils/default.nix | 4 +- .../linux/intel-compute-runtime/default.nix | 4 +- pkgs/os-specific/linux/ipset/default.nix | 4 +- pkgs/os-specific/linux/iptables/default.nix | 4 +- pkgs/os-specific/linux/iputils/default.nix | 4 +- pkgs/os-specific/linux/ipvsadm/default.nix | 4 +- pkgs/os-specific/linux/irqbalance/default.nix | 4 +- pkgs/os-specific/linux/iwd/default.nix | 4 +- pkgs/os-specific/linux/jool/cli.nix | 4 +- pkgs/os-specific/linux/kbd/default.nix | 4 +- pkgs/os-specific/linux/kernel/perf.nix | 4 +- pkgs/os-specific/linux/kmod/default.nix | 4 +- pkgs/os-specific/linux/kmscon/default.nix | 4 +- pkgs/os-specific/linux/kmscube/default.nix | 4 +- pkgs/os-specific/linux/latencytop/default.nix | 4 +- pkgs/os-specific/linux/libatasmart/default.nix | 4 +- pkgs/os-specific/linux/libbpf/default.nix | 6 +- pkgs/os-specific/linux/libevdevc/default.nix | 2 +- pkgs/os-specific/linux/libfabric/default.nix | 4 +- pkgs/os-specific/linux/libgestures/default.nix | 4 +- pkgs/os-specific/linux/libnl/default.nix | 4 +- pkgs/os-specific/linux/libpsm2/default.nix | 4 +- pkgs/os-specific/linux/libratbag/default.nix | 4 +- pkgs/os-specific/linux/libselinux/default.nix | 4 +- pkgs/os-specific/linux/libsemanage/default.nix | 4 +- pkgs/os-specific/linux/libsmbios/default.nix | 4 +- pkgs/os-specific/linux/lightum/default.nix | 4 +- pkgs/os-specific/linux/lvm2/default.nix | 4 +- pkgs/os-specific/linux/lxc/default.nix | 4 +- pkgs/os-specific/linux/lxcfs/default.nix | 4 +- pkgs/os-specific/linux/miraclecast/default.nix | 4 +- pkgs/os-specific/linux/multipath-tools/default.nix | 4 +- pkgs/os-specific/linux/nfs-utils/default.nix | 4 +- pkgs/os-specific/linux/nftables/default.nix | 4 +- pkgs/os-specific/linux/numatop/default.nix | 4 +- pkgs/os-specific/linux/nvidia-x11/settings.nix | 4 +- pkgs/os-specific/linux/odp-dpdk/default.nix | 4 +- pkgs/os-specific/linux/ofp/default.nix | 4 +- pkgs/os-specific/linux/openvswitch/default.nix | 4 +- pkgs/os-specific/linux/openvswitch/lts.nix | 4 +- pkgs/os-specific/linux/pam_mount/default.nix | 4 +- pkgs/os-specific/linux/pam_pgsql/default.nix | 4 +- pkgs/os-specific/linux/pam_u2f/default.nix | 4 +- pkgs/os-specific/linux/pam_usb/default.nix | 4 +- pkgs/os-specific/linux/piper/default.nix | 4 +- pkgs/os-specific/linux/pktgen/default.nix | 4 +- pkgs/os-specific/linux/plymouth/default.nix | 4 +- pkgs/os-specific/linux/pommed-light/default.nix | 4 +- pkgs/os-specific/linux/powertop/default.nix | 4 +- pkgs/os-specific/linux/procps-ng/default.nix | 4 +- pkgs/os-specific/linux/pscircle/default.nix | 4 +- pkgs/os-specific/linux/radeontools/default.nix | 4 +- pkgs/os-specific/linux/radeontop/default.nix | 4 +- pkgs/os-specific/linux/rdma-core/default.nix | 4 +- pkgs/os-specific/linux/rewritefs/default.nix | 4 +- pkgs/os-specific/linux/roccat-tools/default.nix | 4 +- pkgs/os-specific/linux/rtkit/default.nix | 4 +- pkgs/os-specific/linux/sssd/default.nix | 4 +- pkgs/os-specific/linux/systemd/default.nix | 4 +- pkgs/os-specific/linux/thunderbolt/default.nix | 4 +- pkgs/os-specific/linux/udisks-glue/default.nix | 4 +- pkgs/os-specific/linux/udisks/1-default.nix | 4 +- pkgs/os-specific/linux/udisks/2-default.nix | 4 +- pkgs/os-specific/linux/unstick/default.nix | 4 +- pkgs/os-specific/linux/upower/default.nix | 4 +- pkgs/os-specific/linux/usbguard/default.nix | 4 +- pkgs/os-specific/linux/usbutils/default.nix | 4 +- pkgs/os-specific/linux/usermount/default.nix | 4 +- pkgs/os-specific/linux/util-linux/default.nix | 4 +- pkgs/os-specific/linux/uvcdynctrl/default.nix | 4 +- pkgs/os-specific/linux/v4l-utils/default.nix | 4 +- pkgs/os-specific/linux/wpa_supplicant/default.nix | 4 +- pkgs/os-specific/linux/xf86-input-cmt/default.nix | 4 +- .../os-specific/linux/xf86-input-wacom/default.nix | 4 +- .../linux/xf86-video-nested/default.nix | 4 +- pkgs/os-specific/linux/xsensors/default.nix | 4 +- pkgs/os-specific/linux/zenmonitor/default.nix | 4 +- pkgs/os-specific/linux/zfs/default.nix | 4 +- pkgs/os-specific/solo5/default.nix | 4 +- pkgs/os-specific/windows/cygwin-setup/default.nix | 4 +- pkgs/servers/apcupsd/default.nix | 4 +- pkgs/servers/asterisk/default.nix | 4 +- pkgs/servers/brickd/default.nix | 4 +- pkgs/servers/code-server/default.nix | 4 +- pkgs/servers/computing/slurm/default.nix | 4 +- pkgs/servers/computing/torque/default.nix | 4 +- pkgs/servers/corosync/default.nix | 4 +- pkgs/servers/dns/dnsdist/default.nix | 4 +- pkgs/servers/dns/knot-dns/default.nix | 4 +- pkgs/servers/dns/knot-resolver/default.nix | 4 +- pkgs/servers/dns/pdns-recursor/default.nix | 4 +- pkgs/servers/dns/powerdns/default.nix | 4 +- pkgs/servers/fcgiwrap/default.nix | 4 +- pkgs/servers/fileshare/default.nix | 4 +- pkgs/servers/hitch/default.nix | 4 +- .../apache-modules/mod_auth_mellon/default.nix | 4 +- .../servers/http/apache-modules/mod_ca/default.nix | 4 +- .../http/apache-modules/mod_crl/default.nix | 4 +- .../http/apache-modules/mod_csr/default.nix | 4 +- .../http/apache-modules/mod_dnssd/default.nix | 4 +- .../http/apache-modules/mod_ocsp/default.nix | 4 +- .../http/apache-modules/mod_pkcs12/default.nix | 4 +- .../http/apache-modules/mod_scep/default.nix | 4 +- .../http/apache-modules/mod_spkac/default.nix | 4 +- .../http/apache-modules/mod_timestamp/default.nix | 4 +- pkgs/servers/http/apt-cacher-ng/default.nix | 4 +- pkgs/servers/http/couchdb/default.nix | 4 +- pkgs/servers/http/h2o/default.nix | 4 +- pkgs/servers/http/lighttpd/default.nix | 4 +- pkgs/servers/http/lwan/default.nix | 4 +- pkgs/servers/http/pshs/default.nix | 4 +- pkgs/servers/http/redstore/default.nix | 4 +- pkgs/servers/irc/atheme/default.nix | 4 +- pkgs/servers/irker/default.nix | 4 +- pkgs/servers/ldap/389/default.nix | 4 +- pkgs/servers/mail/dovecot/default.nix | 4 +- pkgs/servers/mail/exim/default.nix | 4 +- pkgs/servers/mail/opensmtpd/extras.nix | 6 +- pkgs/servers/mail/postfix/pfixtools.nix | 4 +- pkgs/servers/mail/rspamd/default.nix | 4 +- pkgs/servers/mediatomb/default.nix | 4 +- pkgs/servers/mirrorbits/default.nix | 4 +- pkgs/servers/misc/oven-media-engine/default.nix | 4 +- pkgs/servers/monitoring/lcdproc/default.nix | 4 +- pkgs/servers/monitoring/zabbix/agent.nix | 4 +- pkgs/servers/monitoring/zabbix/proxy.nix | 4 +- pkgs/servers/monitoring/zabbix/server.nix | 4 +- pkgs/servers/mumsi/default.nix | 6 +- pkgs/servers/neard/default.nix | 4 +- pkgs/servers/nosql/redis/default.nix | 4 +- pkgs/servers/osrm-backend/default.nix | 4 +- pkgs/servers/pulseaudio/default.nix | 4 +- pkgs/servers/pulseaudio/pali.nix | 4 +- pkgs/servers/quagga/default.nix | 4 +- pkgs/servers/rpcbind/default.nix | 4 +- pkgs/servers/samba/4.x.nix | 4 +- pkgs/servers/scylladb/default.nix | 4 +- pkgs/servers/search/groonga/default.nix | 4 +- pkgs/servers/shairplay/default.nix | 4 +- pkgs/servers/shairport-sync/default.nix | 4 +- pkgs/servers/shishi/default.nix | 4 +- pkgs/servers/sip/freeswitch/default.nix | 4 +- pkgs/servers/sip/sipwitch/default.nix | 4 +- pkgs/servers/smcroute/default.nix | 4 +- pkgs/servers/sql/mariadb/default.nix | 4 +- pkgs/servers/sql/mysql/5.7.x.nix | 4 +- pkgs/servers/sql/mysql/8.0.x.nix | 4 +- pkgs/servers/sql/postgresql/default.nix | 4 +- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 +- pkgs/servers/sql/postgresql/ext/postgis.nix | 4 +- pkgs/servers/sql/postgresql/ext/tsearch_extras.nix | 4 +- pkgs/servers/squid/default.nix | 4 +- pkgs/servers/tang/default.nix | 4 +- pkgs/servers/tmate-ssh-server/default.nix | 4 +- pkgs/servers/ttyd/default.nix | 4 +- pkgs/servers/tvheadend/default.nix | 4 +- pkgs/servers/uwsgi/default.nix | 4 +- pkgs/servers/varnish/default.nix | 4 +- pkgs/servers/varnish/digest.nix | 4 +- pkgs/servers/varnish/dynamic.nix | 4 +- pkgs/servers/varnish/modules.nix | 4 +- pkgs/servers/web-apps/fileshelter/default.nix | 4 +- pkgs/servers/web-apps/sogo/default.nix | 4 +- pkgs/servers/web-apps/virtlyst/default.nix | 4 +- pkgs/servers/x11/quartz-wm/default.nix | 4 +- pkgs/servers/x11/xorg/default.nix | 884 ++++++++++----------- .../x11/xorg/generate-expr-from-tarballs.pl | 4 +- pkgs/servers/x11/xorg/overrides.nix | 8 +- pkgs/servers/x11/xorg/xcb-util-xrm.nix | 4 +- pkgs/servers/xmpp/biboumi/default.nix | 4 +- pkgs/servers/zoneminder/default.nix | 4 +- pkgs/tools/bluetooth/obexftp/default.nix | 4 +- pkgs/tools/networking/curl/default.nix | 4 +- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 14 +- pkgs/top-level/dotnet-packages.nix | 4 +- pkgs/top-level/emscripten-packages.nix | 10 +- pkgs/top-level/lua-packages.nix | 4 +- pkgs/top-level/perl-packages.nix | 20 +- pkgs/top-level/php-packages.nix | 6 +- pkgs/top-level/python-packages.nix | 80 +- pkgs/top-level/release-small.nix | 2 +- 1653 files changed, 3872 insertions(+), 3872 deletions(-) (limited to 'pkgs/development/libraries/libuv/default.nix') diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index 1d18f4a9230..2899d4ea6ef 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 43844d0c66b..fe0d8fe8634 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 e1449131f16..2ff36bb6833 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 35c9cda1821..4f76178a29d 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 cdf9e3e538e..ecc429de6b2 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 e4a196d0f6b..636314bf1ca 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 99c3ca73607..88956a190c4 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 c4a7829157d..896f9361947 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 2e849912edb..c3cba87e300 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 c441a2f9f3f..82a2303e26b 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 c1701671bee..6a4abbbdf53 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 ffda8b6734d..b1808ed90f1 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 4b4b5ce5678..a8a2f8813af 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 f00167026b4..b6c2a1b1ae6 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 ebea6251dfb..6108d84c3d9 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 cc6df2328e0..104c795c11e 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 d58ff73bb70..e86341a608e 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 93e010d826d..d45b42ddb9f 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 e4f96e396c9..7e45d6a826f 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 c833bd1262b..d307307fd1d 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 b94e8d2e6f2..d71420d0722 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 8fecd558e67..bdcbf024e60 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 bbdcbc21b78..8f02e8da893 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 3800e351fab..a4b68707ee7 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 b7b42b0aa7d..12aec0d4cbb 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 e573c7c14b1..2193b359e68 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 307e06602e7..79f78452c4c 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 a30d604e346..e78e50877d3 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 800458e7925..9eda6333112 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 819192fc1d4..16cefc5ff85 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 d5894e2fdbc..3f62e73e7e4 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 ad388e23d9f..bc6d206956f 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 7bc0a4d1fa6..d0c1b4f9e50 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 ea152b59a50..4abaec8dadd 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 0ada1dfeaa6..4f3d2a6a4dc 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 f69e101877b..dfaf7127f4b 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 82a47b8173a..c175804a026 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 6f5431cf1d8..65c871640ef 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 wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac gsettings-desktop-schemas gnome3.adwaita-icon-theme diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix index 8897abd7007..25ed8a71aa1 100644 --- a/pkgs/applications/audio/ekho/default.nix +++ b/pkgs/applications/audio/ekho/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libsndfile, libpulseaudio }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DEKHO_DATA_PATH=\"$out/share/ekho-data\"" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile libpulseaudio ]; } diff --git a/pkgs/applications/audio/ensemble-chorus/default.nix b/pkgs/applications/audio/ensemble-chorus/default.nix index 65dac936a38..7858da25b7c 100644 --- a/pkgs/applications/audio/ensemble-chorus/default.nix +++ b/pkgs/applications/audio/ensemble-chorus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fltk, alsaLib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, fltk, alsaLib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "ensemble-chorus"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fltk alsaLib freetype libXrandr libXinerama libXcursor lv2 libjack2 diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index 720e1d4484a..50d7af6d116 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkg-config , ronn , pcaudiolibSupport ? true, pcaudiolib , sonicSupport ? true, sonic }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0jkqhf2h94vbqq7mg7mmm23bq372fa7mdk941my18c3vkldcir1b"; }; - nativeBuildInputs = [ autoconf automake which libtool pkgconfig ronn ]; + nativeBuildInputs = [ autoconf automake which libtool pkg-config ronn ]; buildInputs = lib.optional pcaudiolibSupport pcaudiolib ++ lib.optional sonicSupport sonic; diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index c7c975ef953..aa0dc90adf5 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, unzip, portaudio, wxGTK, sox }: +{ lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK, sox }: stdenv.mkDerivation rec { name = "espeakedit-1.48.03"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ unzip portaudio wxGTK ]; # TODO: diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 365055523ea..6d7d2e2c2ba 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -2,7 +2,7 @@ , coreutils , fetchurl , makeWrapper -, pkgconfig +, pkg-config }: with lib.strings; @@ -159,7 +159,7 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 52a291603f8..990d073528e 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -2,7 +2,7 @@ , coreutils , fetchFromGitHub , makeWrapper -, pkgconfig +, pkg-config , cmake , llvm , emscripten @@ -45,7 +45,7 @@ let inherit src; - nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ]; + nativeBuildInputs = [ makeWrapper pkg-config cmake vim which ]; buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ]; @@ -168,7 +168,7 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; diff --git a/pkgs/applications/audio/faust/faust2jackrust.nix b/pkgs/applications/audio/faust/faust2jackrust.nix index 2562237424e..77335da2ce7 100644 --- a/pkgs/applications/audio/faust/faust2jackrust.nix +++ b/pkgs/applications/audio/faust/faust2jackrust.nix @@ -6,7 +6,7 @@ , gcc , gnumake , openssl -, pkgconfig +, pkg-config }: @@ -14,5 +14,5 @@ faust.wrapWithBuildEnv { baseName = "faust2jackrust"; - propagatedBuildInputs = [ libjack2 cargo binutils gcc gnumake openssl pkgconfig ]; + propagatedBuildInputs = [ libjack2 cargo binutils gcc gnumake openssl pkg-config ]; } diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index b9750dd649a..a9dc7308aca 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkgconfig, shntool, flac +{ stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkg-config, shntool, flac , opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain, gtk3, qtbase , qttools, wrapQtAppsHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "04yp3aym7h70xjni9ancqv5lc4zds5a8dgw3fzgqs8k5nmh074gv"; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase qttools libuchardet ]; bin_path = lib.makeBinPath [ diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 8c7a9775945..a1fee315d44 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake , alsaLib, glib, libjack2, libsndfile, libpulseaudio , AudioUnit, CoreAudio, CoreMIDI, CoreServices , version ? "2" @@ -30,7 +30,7 @@ stdenv.mkDerivation { inherit sha256; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ glib libsndfile libpulseaudio libjack2 ] ++ lib.optionals stdenv.isLinux [ alsaLib ] diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix index d8741525da5..57b4bec50ad 100644 --- a/pkgs/applications/audio/fmsynth/default.nix +++ b/pkgs/applications/audio/fmsynth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkg-config }: stdenv.mkDerivation { pname = "fmsynth-unstable"; version = "2015-02-07"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1bk0bpr069hzx2508rgfbwpxiqgr7dmdkhqdywmd2i4rmibgrm1q"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtkmm2 lv2 lvtk ]; buildPhase = '' diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index 006dbaf7980..ece8dc8d1ea 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, lv2, pkgconfig, python2, wafHook }: +{ lib, stdenv, fetchurl, lv2, pkg-config, python2, wafHook }: stdenv.mkDerivation rec { pname = "fomp"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01ld6yjrqrki6zwac8lmwmqkr5rv0sdham4pfbfkjwck4hi1gqqw"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ lv2 python2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 6f91f1e1977..f7abeb2a91e 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkg-config }: stdenv.mkDerivation { version = "git-2015-05-21"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0i8261n95n4xic766h70xkrpbvw3sag96n1883ahmg6h7yb94avq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 gtk2 lv2 faust ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index f484a76e75a..7bd063d9f53 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, gnutls, freetype +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gnutls, freetype , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis , libSM, libsndfile, libogg, libtool }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1xff5whr02cixihgd257dc70hnyf22j3zamvhsvg4lp7zq9l2in4"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook libtool ]; + nativeBuildInputs = [ pkg-config autoreconfHook libtool ]; buildInputs = [ freetype SDL SDL_gfx SDL_ttf liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index a97d1d3516f..1187dd1ba26 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, which +{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, which , docbook_xml_dtd_45, docbook_xsl, gtkmm2, libgig, libsndfile, libxslt }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = "make -f Makefile.svn"; - nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ]; + nativeBuildInputs = [ autoconf automake intltool libtool pkg-config which ]; buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2 libgig libsndfile libxslt ]; diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index f2ba8ab3bfa..32c61380dca 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus-glib, audacious, gtk2, gsl +{ lib, stdenv, fetchurl, pkg-config, mpd_clientlib, dbus-glib, audacious, gtk2, gsl , libaudclient }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1a1vv4r0vnxjdyl0jyv7gga3zfd5azxlwjm1l6hjrf71lb228zn8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ]; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index d3d0d5fcd0a..11187015df0 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libtool, intltool, pkgconfig, glib +{ lib, stdenv, fetchurl, libtool, intltool, pkg-config, glib , gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique , libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; patches = [ ./libmpd-11.8.17-remove-strndup.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; }; - nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook ]; buildInputs = [ glib gtk2 curl mpd_clientlib libsoup libunique libmpd libSM libICE sqlite hicolor-icon-theme diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index 8686150c08a..ed51304b225 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -8,7 +8,7 @@ , cargo , rustc , python3 -, pkgconfig +, pkg-config , glib , libhandy_0 , gtk3 @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext cargo rustc diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index f9fda0fe7bd..1e0fc40b533 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , python3 , gsettings-desktop-schemas , desktop-file-utils @@ -30,7 +30,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 80008080ead..2d660bc736c 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchsvn, cmake, pkg-config, gcc, pkgconfig, fftwFloat, alsaLib +{ lib, stdenv, fetchsvn, cmake, gcc, pkg-config, fftwFloat, alsaLib , zlib, wavpack, wxGTK31, udev, jackaudioSupport ? false, libjack2 , includeDemo ? true }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ pkgconfig fftwFloat alsaLib zlib wavpack wxGTK31 udev ] + buildInputs = [ pkg-config fftwFloat alsaLib zlib wavpack wxGTK31 udev ] ++ lib.optional jackaudioSupport libjack2; cmakeFlags = lib.optional (!jackaudioSupport) [ diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index c504f19de39..f39558c1571 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac, +{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, intltool, libgpod, curl, flac, gnome3, gtk3, gettext, perlPackages, flex, libid3tag, gdl, libvorbis, gdk-pixbuf }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; buildInputs = [ curl gettext flex libgpod libid3tag flac libvorbis gtk3 gdk-pixbuf diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 3f95ae82528..69e427dd96c 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -23,7 +23,7 @@ , lilv , lrdf , lv2 -, pkgconfig +, pkg-config , python2 , sassc , serd @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { gettext hicolor-icon-theme intltool - pkgconfig + pkg-config python2 wafHook wrapGAppsHook diff --git a/pkgs/applications/audio/gxmatcheq-lv2/default.nix b/pkgs/applications/audio/gxmatcheq-lv2/default.nix index 42e5cd726c7..246b034400d 100644 --- a/pkgs/applications/audio/gxmatcheq-lv2/default.nix +++ b/pkgs/applications/audio/gxmatcheq-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "GxMatchEQ.lv2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0azdmgzqwjn26nx38iw13666a1i4y2bv39wk89pf6ihdi46klf72"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 xorgproto cairo lv2 ]; diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix index 9201ff730d9..d71d40f401c 100644 --- a/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "GxPlugins.lv2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 xorgproto cairo lv2 ]; diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index 980b312ba6c..e2c19ac156d 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , alsaLib, freetype, xorg, curl, libGL, libjack2, gnome3 -, pkgconfig, makeWrapper +, pkg-config, makeWrapper }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome3.zenity ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; preBuild = '' cd Projects/LinuxMakefile diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index 1bf3ba6480b..172f134907c 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -7,7 +7,7 @@ , curl , libjack2 , lv2 -, pkgconfig +, pkg-config , libGLU , libGL }: @@ -26,7 +26,7 @@ buildInputs = [ xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext xorg.libXinerama xorg.libXrender xorg.libXrandr - freetype alsaLib curl libjack2 pkgconfig libGLU libGL lv2 + freetype alsaLib curl libjack2 pkg-config libGLU libGL lv2 ]; CXXFLAGS = "-DHAVE_LROUND"; diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix index a8bb81de717..b887615a30f 100644 --- a/pkgs/applications/audio/hybridreverb2/default.nix +++ b/pkgs/applications/audio/hybridreverb2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkgconfig, lv2, alsaLib, libjack2, +{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkg-config, lv2, alsaLib, libjack2, freetype, libX11, gtk3, pcre, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at-spi2-core, dbus, curl, fftwFloat }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ lv2 alsaLib libjack2 freetype libX11 gtk3 pcre libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus curl fftwFloat ]; diff --git a/pkgs/applications/audio/hydrogen/0.nix b/pkgs/applications/audio/hydrogen/0.nix index 774b2a93447..1746715b834 100644 --- a/pkgs/applications/audio/hydrogen/0.nix +++ b/pkgs/applications/audio/hydrogen/0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, cmake +{ lib, stdenv, fetchurl, pkg-config, cmake , alsaLib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4 }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ alsaLib boost glib lash libjack2 libarchive libsndfile lrdf qt4 ]; diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 728f0e90a99..e794726e050 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook , alsaLib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf , qtbase, qttools, qtxmlpatterns }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0snljpvbcgikhz610c325dgvayi0k512p3bglck9vvi90wsqx7l1"; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ alsaLib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf qtbase qttools qtxmlpatterns diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index 57d91a298ca..304f67e85aa 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake +{ mkDerivation, lib, fetchFromGitHub, alsaLib, pkg-config, qtbase, qtscript, qmake }: mkDerivation rec { @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "AhoP+Ok78Vk8Aee/RP572hJeM8O7v2ZTvFalOZZqRy8="; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ alsaLib qtbase qtscript ]; qmakeFlags = [ "PREFIX=/" ]; diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix index ce3121e2f95..dd96f720e93 100644 --- a/pkgs/applications/audio/infamousPlugins/default.nix +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: stdenv.mkDerivation rec { pname = "infamousPlugins"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "08xwh6px13y1gykaw103nhvjms7vgbgkcm0avh9f5d2d7aadq0l2"; }) ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ]; meta = with lib; { diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 9bb6ddd6a98..55456b2fb6f 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv -, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom +, lv2, makeWrapper, pkg-config, python, raul, rdflib, serd, sord, sratom , wafHook , suil }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { deepClone = true; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper python raul serd sord sratom suil diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index bc3049dc6b3..6c2b9c5be9c 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }: +{ lib, stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkg-config, zita-convolver }: stdenv.mkDerivation rec { pname = "ir.lv2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ fftw gtk2 lv2 libsamplerate libsndfile zita-convolver ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; postPatch = '' # Fix build with lv2 1.18: https://github.com/tomszilagyi/ir.lv2/pull/20 diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index f5134745a9c..44e6dd1cd8a 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libjack2, libsndfile, pkgconfig }: +{ lib, stdenv, fetchurl, libjack2, libsndfile, pkg-config }: stdenv.mkDerivation rec { pname = "jack_capture"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 libsndfile ]; buildPhase = "PREFIX=$out make jack_capture"; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index c6b971275d4..9905d072361 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL, libjack2, libGLU, libGL, pkgconfig }: +{ lib, stdenv, fetchurl, SDL, libjack2, libGLU, libGL, pkg-config }: stdenv.mkDerivation rec { pname = "jack_oscrolloscope"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libjack2 libGLU libGL ]; installPhase = '' diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index a65c8034f89..ec62cb04c85 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk2, alsaLib, libxml2, lrdf }: +{ lib, stdenv, fetchurl, pkg-config, libjack2, ladspaH, gtk2, alsaLib, libxml2, lrdf }: stdenv.mkDerivation rec { name = "jack-rack-1.4.7"; src = fetchurl { url = "mirror://sourceforge/jack-rack/${name}.tar.bz2"; sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 lrdf ]; NIX_LDFLAGS = "-ldl -lm -lpthread"; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 499badac6d2..2b4d413526a 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libjack2, pkgconfig }: +{ lib, stdenv, fetchurl, libjack2, pkg-config }: stdenv.mkDerivation rec { name = "jackmeter-0.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 ]; meta = { diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index 14cda8a81b5..eecafe9e501 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }: +{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }: mkDerivation rec { pname = "jackmix"; @@ -13,7 +13,7 @@ mkDerivation rec { patches = [ ./no_error.patch ]; - nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkgconfig ]; + nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkg-config ]; buildInputs = [ qtbase lash diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index d3ed57436c9..5d322eeca93 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkgconfig, python +{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python , serd, sord , sratom, suil, wafHook }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1wwfn7yzbs37s2rdlfjgks63svd5g14yyzd2gdl7h0z12qncwsy2"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ gtk2 libjack2 lilv lv2 python serd sord sratom suil ]; diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 7f6501a473d..f111c4e99d7 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fftwFloat, gtk2, ladspaPlugins, libjack2, liblo, libxml2 -, makeWrapper, pkgconfig, perlPackages +, makeWrapper, pkg-config, perlPackages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index 05ac14eec09..281a7148dfe 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, sconsPackages, pkgconfig +{ lib, stdenv, fetchurl, sconsPackages, pkg-config , libsamplerate, libsndfile, liblo, libjack2, boost }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42"; }; - nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkgconfig ]; + nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkg-config ]; buildInputs = [ libsamplerate libsndfile liblo libjack2 boost ]; prefixKey = "PREFIX="; NIX_CFLAGS_COMPILE = "-fpermissive"; diff --git a/pkgs/applications/audio/klystrack/default.nix b/pkgs/applications/audio/klystrack/default.nix index ea8cfcec2e4..5d26397efdb 100644 --- a/pkgs/applications/audio/klystrack/default.nix +++ b/pkgs/applications/audio/klystrack/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , SDL2, SDL2_image -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 SDL2_image ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; patches = [ (fetchpatch { diff --git a/pkgs/applications/audio/kmetronome/default.nix b/pkgs/applications/audio/kmetronome/default.nix index 415bfe37026..ca8df45e459 100644 --- a/pkgs/applications/audio/kmetronome/default.nix +++ b/pkgs/applications/audio/kmetronome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig, qttools, alsaLib, drumstick, qtbase, qtsvg }: +{ lib, stdenv, fetchurl, cmake, pkg-config, qttools, alsaLib, drumstick, qtbase, qtsvg }: stdenv.mkDerivation rec { pname = "kmetronome"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0bzm6vzlm32kjrgn1nvp096b2d41ybys2sk145nhy992wg56v32s"; }; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; buildInputs = [ alsaLib drumstick qtbase qtsvg ]; diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 855056c6c15..fe8e9f323a5 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, automake, fftw, ladspaH, libxml2, pkgconfig +{ lib, stdenv, fetchurl, autoreconfHook, automake, fftw, ladspaH, libxml2, pkg-config , perlPackages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1rqwh8xrw6hnp69dg4gy336bfbfpmbx4fjrk0nb8ypjcxkz91c6i"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fftw ladspaH libxml2 perlPackages.perl perlPackages.XMLParser ]; patchPhase = '' diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index 26a8568f01a..eb355a43409 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, alsaLib, gtk2, libjack2, libuuid, libxml2 -, makeWrapper, pkgconfig, readline }: +, makeWrapper, pkg-config, readline }: assert libuuid != null; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./socket.patch ./gcc-47.patch ]; buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper - pkgconfig readline ]; + pkg-config readline ]; propagatedBuildInputs = [ libuuid ]; NIX_LDFLAGS = "-lm -lpthread -luuid"; diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index e8e6accefdb..7ba47be686e 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, withRodio ? true +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true , withALSA ? true, alsaLib ? null, withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null }: @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ])) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional withALSA alsaLib ++ lib.optional withPulseAudio libpulseaudio diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix index 92933d21d13..057d45c85e9 100644 --- a/pkgs/applications/audio/linuxband/default.nix +++ b/pkgs/applications/audio/linuxband/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, python2Packages }: +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, MMA, libjack2, libsmf, python2Packages }: let inherit (python2Packages) pyGtkGlade pygtksourceview python; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper MMA libjack2 libsmf python pyGtkGlade pygtksourceview ]; patchPhase = '' diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 5eda9e92123..1daeb2cf379 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, bison, libtool, pkgconfig, which +{ lib, stdenv, fetchurl, autoconf, automake, bison, libtool, pkg-config, which , alsaLib, asio, libjack2, libgig, libsndfile, lv2 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { make -f Makefile.svn ''; - nativeBuildInputs = [ autoconf automake bison libtool pkgconfig which ]; + nativeBuildInputs = [ autoconf automake bison libtool pkg-config which ]; buildInputs = [ alsaLib asio libjack2 libgig libsndfile lv2 ]; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index ef95bf59494..4d52a286aba 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, alsaLib ? null, fftwFloat, fltk13 +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, alsaLib ? null, fftwFloat, fltk13 , fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null , qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }: @@ -15,7 +15,7 @@ mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake qttools pkgconfig ]; + nativeBuildInputs = [ cmake qttools pkg-config ]; buildInputs = [ alsaLib diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 14ab2aaf2d0..c85645565ee 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -3,7 +3,7 @@ , nix-update-script , meson , ninja -, pkgconfig +, pkg-config , python3 , gtk3 , gst_all_1 @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index f4cb5e80890..6dc57cae0d6 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper , libsndfile, jack2Full , libGLU, libGL, lv2, cairo , ladspaH, php }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1apw8zh3a3il4smkjji6bih4vbsymj0hjs10fgkrd4nazqkjvgyd"; }; - nativeBuildInputs = [ pkgconfig php makeWrapper ]; + nativeBuildInputs = [ pkg-config php makeWrapper ]; buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ]; makeFlags = [ diff --git a/pkgs/applications/audio/ltc-tools/default.nix b/pkgs/applications/audio/ltc-tools/default.nix index 31986762fc1..c8c87959727 100644 --- a/pkgs/applications/audio/ltc-tools/default.nix +++ b/pkgs/applications/audio/ltc-tools/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, pkgconfig, libltc, libsndfile, jack2}: +{lib, stdenv, fetchFromGitHub, pkg-config, libltc, libsndfile, jack2}: stdenv.mkDerivation rec { pname = "ltc-tools"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0vp25b970r1hv5ndzs4di63rgwnl31jfaj3jz5dka276kx34q4al"; }; - buildInputs = [ pkgconfig libltc libsndfile jack2 ]; + buildInputs = [ pkg-config libltc libsndfile jack2 ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/luppp/default.nix b/pkgs/applications/audio/luppp/default.nix index ac7ff3a3084..36d329bcafd 100644 --- a/pkgs/applications/audio/luppp/default.nix +++ b/pkgs/applications/audio/luppp/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config , jack2 , cairo , liblo @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/audio/lv2-cpp-tools/default.nix b/pkgs/applications/audio/lv2-cpp-tools/default.nix index b6e878d4836..f1709d00558 100644 --- a/pkgs/applications/audio/lv2-cpp-tools/default.nix +++ b/pkgs/applications/audio/lv2-cpp-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, pkgconfig, lv2, gtkmm2, boost }: +{ lib, stdenv, fetchzip, pkg-config, lv2, gtkmm2, boost }: stdenv.mkDerivation rec { pname = "lv2-cpp-tools"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -r 's,/sbin/ldconfig,ldconfig,g' -i ./Makefile.template ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 gtkmm2 boost ]; diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix index 8f997a28193..553e0e67f83 100644 --- a/pkgs/applications/audio/lv2bm/default.nix +++ b/pkgs/applications/audio/lv2bm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, glib, libsndfile, lilv, lv2, pkgconfig, serd, sord, sratom }: +{ lib, stdenv, fetchFromGitHub, glib, libsndfile, lilv, lv2, pkg-config, serd, sord, sratom }: stdenv.mkDerivation rec { pname = "lv2bm"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0vlppxfb9zbmffazs1kiyb79py66s8x9hihj36m2vz86zsq7ybl0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libsndfile lilv lv2 serd sord sratom ]; installPhase = '' diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index b53ea7a7963..30d654ab87a 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook, python3 }: +{ lib, stdenv, fetchurl, fftwSinglePrec, lv2, pkg-config, wafHook, python3 }: stdenv.mkDerivation rec { pname = "mda-lv2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8"; }; - nativeBuildInputs = [ pkgconfig wafHook python3 ]; + nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ fftwSinglePrec lv2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/applications/audio/mellowplayer/default.nix index 37c38496773..cddf1afd654 100644 --- a/pkgs/applications/audio/mellowplayer/default.nix +++ b/pkgs/applications/audio/mellowplayer/default.nix @@ -3,7 +3,7 @@ , lib , libnotify , mkDerivation -, pkgconfig +, pkg-config , qtbase , qtdeclarative , qtgraphicaleffects @@ -23,7 +23,7 @@ mkDerivation rec { sha256 = "1p0z8hkbxaxrqjmknjwxb0mpf3xdssik3m5cwrsv1881k1x2x5qs"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libnotify diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix index fbf23fbbd58..a825eaa4e38 100644 --- a/pkgs/applications/audio/meterbridge/default.nix +++ b/pkgs/applications/audio/meterbridge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, SDL, SDL_image, libjack2 +{ lib, stdenv, fetchurl, pkg-config, SDL, SDL_image, libjack2 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch]; buildInputs = - [ pkgconfig SDL SDL_image libjack2 + [ pkg-config SDL SDL_image libjack2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index 86a608db4c8..b21b859596e 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , lv2, libGLU, libGL, gtk2, cairo, pango, fftwFloat, libjack2 }: let @@ -25,7 +25,7 @@ in stdenv.mkDerivation { inherit name; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 libGLU libGL gtk2 cairo pango fftwFloat libjack2 ]; srcs = [ src robtkSrc ]; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index c87a050ed33..82f9b70c618 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, SDL, alsaLib, autoreconfHook, gtk2, libjack2, ladspaH -, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame +, ladspaPlugins, libsamplerate, libsndfile, pkg-config, libpulseaudio, lame , vorbis-tools }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "037pbq23kh8hsih994x2sv483imglwcrqrx6m8visq9c46fi0j1y"; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; preAutoreconf = "(cd docgen && sh gendocs.sh)"; diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index b061b48abc8..b43694eb9c0 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeWrapper , SDL2, alsaLib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk"; }; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ]; diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index 52079e1f441..57af7a469a0 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, pkgconfig +{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config , alsaLib, libtool, icu , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index ef0db55f090..70e6616482f 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -2,7 +2,7 @@ , fftw, flac, faad2, glibcLocales, mp4v2 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , libGLU, libxcb, lilv, lv2, opusfile -, pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg +, pkg-config, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg , qtx11extras, rubberband, sconsPackages, sqlite, taglib, upower, vamp-plugin-sdk }: @@ -31,7 +31,7 @@ mkDerivation rec { nativeBuildInputs = [ sconsPackages.scons_3_1_2 ]; buildInputs = [ chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout241 libsndfile - libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg + libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkg-config portaudio portmidi protobuf qtbase qtscript qtsvg qtx11extras rubberband sqlite taglib upower vamp-plugin-sdk ]; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index b2621a4ef11..51d197fb0e0 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , ncurses, db , popt, libtool # Sound sub-systems , alsaSupport ? true, alsaLib @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ++ opt withffmpeg4 ./moc-ffmpeg4.patch ++ opt pulseSupport ./pulseaudio.patch; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ opt pulseSupport autoreconfHook; buildInputs = [ ncurses db popt libtool ] diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index 28ea6793f0d..d67b4da5eb2 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, ncurses, pkgconfig, gtk2 }: +{ fetchurl, lib, stdenv, ncurses, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "mp3info-0.8.5a"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix index 2ff147fa919..1407c153aed 100644 --- a/pkgs/applications/audio/mp3splt/default.nix +++ b/pkgs/applications/audio/mp3splt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libmp3splt }: +{ lib, stdenv, fetchurl, pkg-config, libmp3splt }: stdenv.mkDerivation rec { pname = "mp3splt"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; configureFlags = [ "--enable-oggsplt-symlink" "--enable-flacsplt-symlink" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmp3splt ]; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index fcf438e5f0e..c1b88e47e87 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, mpd_clientlib, sphinx, libiconv }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, mpd_clientlib, sphinx, libiconv }: stdenv.mkDerivation rec { pname = "mpc"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ mpd_clientlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - nativeBuildInputs = [ meson ninja pkgconfig sphinx ]; + nativeBuildInputs = [ meson ninja pkg-config sphinx ]; meta = with lib; { description = "A minimalist command line interface to MPD"; diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index a583e45be2c..22d66b18ddd 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, wrapQtAppsHook +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools, wrapQtAppsHook , alsaLib, dssi, fluidsynth, ladspaH, lash, libinstpatch, libjack2, liblo , libsamplerate, libsndfile, lilv, lrdf, lv2, qtsvg, rtaudio, rubberband, sord }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-parallel-building.patch ]; - nativeBuildInputs = [ cmake pkgconfig qttools wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ alsaLib dssi fluidsynth ladspaH lash libinstpatch libjack2 liblo diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index fa05e45b668..e150888ac6d 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkg-config , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects , qtquickcontrols2, qtscript, qtsvg, qttools @@ -31,7 +31,7 @@ mkDerivation rec { "--set QML_DISABLE_DISK_CACHE 1" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 4f0449401dd..59b17d9c811 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, ncurses +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, ncurses , mpd_clientlib, gettext, boost , pcreSupport ? false , pcre ? null @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ncurses mpd_clientlib boost ] ++ optional pcreSupport pcre; - nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + nativeBuildInputs = [ meson ninja pkg-config gettext ]; mesonFlags = [ "-Dlirc=disabled" diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 7f645ac7986..64ca6823b91 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkgconfig, readline +{ lib, stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkg-config, readline , libiconv, icu, curl , outputsSupport ? true # outputs screen , visualizerSupport ? false, fftw ? null # visualizer screen @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ++ optional clockSupport "--enable-clock" ++ optional taglibSupport "--with-taglib"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost mpd_clientlib ncurses readline libiconv icu curl ] ++ optional visualizerSupport fftw diff --git a/pkgs/applications/audio/ninjas2/default.nix b/pkgs/applications/audio/ninjas2/default.nix index 5af483ecfe3..8fa5bed3066 100644 --- a/pkgs/applications/audio/ninjas2/default.nix +++ b/pkgs/applications/audio/ninjas2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg, mesa, libsndfile, libsamplerate }: +{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkg-config, xorg, mesa, libsndfile, libsamplerate }: stdenv.mkDerivation rec { pname = "ninjas2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patchShebangs dpf/utils/generate-ttl.sh ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 xorg.libX11 libGL mesa libsndfile libsamplerate ]; diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/pkgs/applications/audio/noise-repellent/default.nix index 88281cd0989..7aaa8ddd843 100644 --- a/pkgs/applications/audio/noise-repellent/default.nix +++ b/pkgs/applications/audio/noise-repellent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fftwFloat, lv2 }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, fftwFloat, lv2 }: stdenv.mkDerivation rec { pname = "noise-repellent"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2"); - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ fftwFloat lv2 ]; diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index fbdfb78cab0..9dd377a601b 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, python2, cairo, libjpeg, ntk, libjack2 +{ lib, stdenv, fetchFromGitHub, pkg-config, python2, cairo, libjpeg, ntk, libjack2 , libsndfile, ladspaH, liblo, libsigcxx, lrdf, wafHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1cljkkyi9dxqpqhx8y6l2ja4zjmlya26m26kqxml8gx08vyvddhx"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ python2 cairo libjpeg ntk libjack2 libsndfile ladspaH liblo libsigcxx lrdf ]; diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index ed5ec361714..cae9353d2de 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, sconsPackages, boost, ladspaH, pkgconfig }: +{lib, stdenv, fetchurl, sconsPackages, boost, ladspaH, pkg-config }: stdenv.mkDerivation { version = "0.2-2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; }; - nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_0_1 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_3_0_1 ]; buildInputs = [ boost ladspaH ]; patchPhase = '' diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index ff7a40d5993..5a610284c21 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, zlib, pkgconfig, mpg123, libogg, libvorbis, portaudio, libsndfile, flac +{ config, lib, stdenv, fetchurl, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; doCheck = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ] ++ lib.optional usePulseAudio libpulseaudio; diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix index f16e8e7a02d..8ca75eecde1 100644 --- a/pkgs/applications/audio/opus-tools/default.nix +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libogg, libao, pkgconfig, flac, opusfile, libopusenc}: +{lib, stdenv, fetchurl, libogg, libao, pkg-config, flac, opusfile, libopusenc}: stdenv.mkDerivation rec { name = "opus-tools-0.2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "11pzl27s4vcz4m18ch72nivbhww2zmzn56wspb7rll1y1nq6rrdl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libogg libao flac opusfile libopusenc ]; meta = { diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index 34813c05e5b..e4f7e6ca6b4 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }: +{ lib, stdenv, fetchurl, pkg-config, openssl, libogg, libopus }: stdenv.mkDerivation rec { name = "opusfile-0.12"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "02smwc5ah8nb3a67mnkjzqmrzk43j356hgj2a97s9midq40qd38i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libogg ]; propagatedBuildInputs = [ libopus ]; patches = [ ./include-multistream.patch ]; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 4db337917ed..1d84aed8b2e 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: +{ lib, stdenv, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: mkDerivation rec { pname = "padthv1"; @@ -11,7 +11,7 @@ mkDerivation rec { buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "polyphonic additive synthesizer"; diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix index deb8bec28c2..fb076797fb5 100644 --- a/pkgs/applications/audio/pamix/default.nix +++ b/pkgs/applications/audio/pamix/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig, cmake +, pkg-config, cmake , libpulseaudio, ncurses }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc/xdg" ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libpulseaudio ncurses ]; meta = with lib; { diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index f2ac17f1556..64e403001a3 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -3,7 +3,7 @@ , meson , ninja , gettext -, pkgconfig +, pkg-config , pulseaudioFull , glibmm , gtkmm3 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meson ninja gettext - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index 7ca0d347fea..acffe9464fa 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -1,4 +1,4 @@ -{ 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 }: +{ 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 }: stdenv.mkDerivation rec { pname = "parlatype"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gettext diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 5f622877552..573b2262e73 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm -, gtkmm2, libjack2, pkgconfig, python2, wafHook +, gtkmm2, libjack2, pkg-config, python2, wafHook }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2 - pkgconfig python2 wafHook + pkg-config python2 wafHook ]; meta = { diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix index f56ad4f5930..1d701004622 100644 --- a/pkgs/applications/audio/paulstretch/default.nix +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , audiofile, libvorbis, fltk, fftw, fftwFloat -, minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate +, minixml, pkg-config, libmad, libjack2, portaudio, libsamplerate }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "06dy03dbz1yznhsn0xvsnkpc5drzwrgxbxdx0hfpsjn2xcg0jrnc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ audiofile diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 198fa1033ab..31d9292675e 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, lib, stdenv, pkgconfig, intltool, libpulseaudio, +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, intltool, libpulseaudio, gtkmm3 , libcanberra-gtk3, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 gnome3.adwaita-icon-theme ]; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; configureFlags = [ "--disable-lynx" ]; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index e9f54aeb58b..0abc933d628 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg_3, curl }: +{ fetchurl, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg_3, curl }: stdenv.mkDerivation rec { name = "pianobar-2020.11.28"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1znlwybfpxsjqr1jmr8j0ci8wzmpzmk2yxb0qcx9w9a8nnbgnfv5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libao json_c libgcrypt ffmpeg_3 curl ]; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 550cfc909d9..c64371f091c 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, appstream-glib +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib , wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection , libnotify, libsecret, gst_all_1 }: @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { patchShebangs meson_post_install.py ''; - nativeBuildInputs = [ meson ninja pkgconfig appstream-glib wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook ]; propagatedBuildInputs = [ gtk3 gobject-introspection libnotify libsecret gnome3.adwaita-icon-theme ] ++ diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix index b906e033601..e209d98ec71 100644 --- a/pkgs/applications/audio/plugin-torture/default.nix +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }: +{ lib, stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkg-config, serd, sord, sratom }: stdenv.mkDerivation { pname = "plugin-torture"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1xyhvhm85d9z0kw716cjllrrzksn4s4bw34layg8hf4m5m31sp2p"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost ladspaH lilv lv2 serd sord sratom ]; installPhase = '' diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix index f54e8e8e9f0..05800c360fa 100644 --- a/pkgs/applications/audio/polyphone/default.nix +++ b/pkgs/applications/audio/polyphone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: mkDerivation rec { version = "2.2.0"; @@ -22,7 +22,7 @@ mkDerivation rec { qtsvg ]; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; preConfigure = '' cd ./sources/ diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix index fb28b10448d..70e7217dff7 100644 --- a/pkgs/applications/audio/ponymix/default.nix +++ b/pkgs/applications/audio/ponymix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libpulseaudio, libnotify, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libpulseaudio, libnotify, pkg-config }: stdenv.mkDerivation rec { pname = "ponymix"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libpulseaudio libnotify ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; postPatch = ''substituteInPlace Makefile --replace "\$(DESTDIR)/usr" "$out"''; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index b87e48768f1..1d3fd534dd2 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, gtk2, pkgconfig }: +{ lib, stdenv, fetchurl, alsaLib, gtk2, pkg-config }: stdenv.mkDerivation rec { pname = "praat"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp praat $out/bin ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib gtk2 ]; meta = { diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 845435be60e..8f4cfb499f2 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -3,7 +3,7 @@ , lib , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , SDL2 , qtdeclarative , libpulseaudio @@ -23,7 +23,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook which ]; diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index c7dc2cc3b1d..331bce3e8be 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -2,7 +2,7 @@ , runCommand , fetchFromGitHub , pulseaudio -, pkgconfig +, pkg-config , ffmpeg , patchelf , fdk_aac @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config patchelf cmake ]; diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index a2c69818137..fca498bd897 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config , itstool , python3 , libxml2 @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config libxml2 itstool python3 diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 9b9b84850dc..d7b4b834321 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkgconfig, qtbase, qttools, alsaLib, libjack2 }: +{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, alsaLib, libjack2 }: mkDerivation rec { version = "0.6.3"; @@ -13,7 +13,7 @@ mkDerivation rec { buildInputs = [ qtbase qttools alsaLib libjack2 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "A MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network"; diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix index 30062955bb5..e24824985fa 100644 --- a/pkgs/applications/audio/qmidiroute/default.nix +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, qt4, alsaLib }: +{ lib, stdenv, fetchurl, pkg-config, qt4, alsaLib }: stdenv.mkDerivation rec { version = "0.4.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ qt4 alsaLib ]; meta = with lib; { diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index f5015325d85..950e16cedc8 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake, pkgconfig, xlibsWrapper +{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, xlibsWrapper , qtbase, qttools, qtmultimedia, qtx11extras # transports , curl, libmms @@ -36,7 +36,7 @@ mkDerivation rec { sha256 = "1kvzw0n90crg3dgy8834qrjv0zb3ia5cny7virax9ax73y653jfa"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ # basic requirements qtbase qttools qtmultimedia qtx11extras xlibsWrapper diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 0418957dee0..03f519d3816 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, qttools +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, qttools , liblscp, libgig, qtbase, mkDerivation }: mkDerivation rec { @@ -10,7 +10,7 @@ mkDerivation rec { sha256 = "1wr7k739zx2nz00b810f60g9k3y92w05nfci987hw7y2sks9rd8j"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config qttools ]; buildInputs = [ liblscp libgig qtbase ]; preConfigure = "make -f Makefile.svn"; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 1ea7852dc10..4b712bf1d25 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkgconfig +{ lib, stdenv, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkg-config , mkDerivation, qtbase, qttools, qtx11extras }: @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "0xiqmpzpxjvh32vivfj6h33w0ahmyfjzjb41b6fnf92bbg9k6mqv"; }; - nativeBuildInputs = [ autoconf pkgconfig ]; + nativeBuildInputs = [ autoconf pkg-config ]; buildInputs = [ alsaLib fluidsynth libjack2 qtbase qttools qtx11extras ]; diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix index 5b84989a7c4..f013c338e76 100644 --- a/pkgs/applications/audio/qtscrobbler/default.nix +++ b/pkgs/applications/audio/qtscrobbler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkgconfig, which, qt4, qmake4Hook }: +{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkg-config, which, qt4, qmake4Hook }: stdenv.mkDerivation rec { pname = "qtscrobbler"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01c8e48f616ed09504833d27d92fd62f455bd645ea2d1cc2a5f4c287d641daba"; }; - nativeBuildInputs = [ qmake4Hook ] ++ lib.optionals withMtp [ pkgconfig which ]; + nativeBuildInputs = [ qmake4Hook ] ++ lib.optionals withMtp [ pkg-config which ]; buildInputs = [ qt4 ] ++ lib.optional withMtp libmtp; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 746092977db..5730bcdcaab 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, cmake, pkgconfig +, cmake, pkg-config # Transport , curl # Libraries @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { sha256 = "1v2nsz7s0jj0wmqabzk6akcf1353rachm1lfq77hxbq9z5pw8pgb"; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook makeWrapper ]; buildInputs = [ curl diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index a29fcf383b8..af35ad829dd 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, fetchFromGitHub, sconsPackages +{ stdenv, lib, pkg-config, fetchFromGitHub, sconsPackages , python, glibmm, libpulseaudio, libao }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - sconsPackages.scons_3_1_2 pkgconfig + sconsPackages.scons_3_1_2 pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index ae45ca62eb9..173741484fd 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , python3 , perl , perlPackages @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool perl perlPackages.XMLParser itstool wrapGAppsHook diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 31fce746077..5c7493ef7db 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, makedepend, perl, pkgconfig, qttools, wrapQtAppsHook +{ lib, stdenv, fetchurl, cmake, makedepend, perl, pkg-config, qttools, wrapQtAppsHook , dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2, alsaLib , liblo, libsamplerate, libsndfile, lirc ? null, lrdf, qtbase }: @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { ''; nativeBuildInputs = - [ cmake makedepend perl pkgconfig qttools wrapQtAppsHook ]; + [ cmake makedepend perl pkg-config qttools wrapQtAppsHook ]; buildInputs = [ dssi diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 17b3f1c3745..4b06a99d473 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkgconfig, libjack2 +{ mkDerivation, lib, fetchurl, pkg-config, libjack2 , alsaLib, liblo, libsndfile, lv2, qtbase, qttools , rubberband }: @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "ePhM9OTLJp1Wa2D9Y1Dqq/69WlEhEp3ih9yNUIJU5Y4="; }; - nativeBuildInputs = [ qttools pkgconfig ]; + nativeBuildInputs = [ qttools pkg-config ]; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qtbase rubberband ]; diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index aa3abd3f0f3..84eebfac695 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkgconfig }: +{ lib, stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkg-config }: stdenv.mkDerivation rec { pname = "seq24"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./mutex_no_nameclash.patch ]; buildInputs = [ alsaLib gtkmm2 libjack2 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "Minimal loop based midi sequencer"; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 0f3b2fcfa95..613abbf3c12 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchzip, alsaLib, freetype, ftgl, libjack2, libX11, lv2 -, libGLU, libGL, pkgconfig, ttf_bitstream_vera +, libGLU, libGL, pkg-config, ttf_bitstream_vera }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { -i b_synth/Makefile ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib freetype ftgl libjack2 libX11 lv2 libGLU libGL ttf_bitstream_vera diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index 4ba30935089..85bc9e3542c 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub , cmake, libjack2, libsndfile, pkgconfig }: +{ lib, stdenv, fetchFromGitHub , cmake, libjack2, libsndfile, pkg-config }: stdenv.mkDerivation rec { pname = "sfizz"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libjack2 libsndfile ]; diff --git a/pkgs/applications/audio/sfxr/default.nix b/pkgs/applications/audio/sfxr/default.nix index 9e5195b2caa..aed27ecdba5 100644 --- a/pkgs/applications/audio/sfxr/default.nix +++ b/pkgs/applications/audio/sfxr/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , desktop-file-utils , SDL , gtk3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - pkgconfig + pkg-config desktop-file-utils ]; diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 2ebf56fee52..cebf0d83e16 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchurl -, pkgconfig +, pkg-config , libsidplayfp , alsaSupport ? stdenv.hostPlatform.isLinux , alsaLib @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "1s2dfs9z1hwarpfzawg11wax9nh0zcqx4cafwq7iysckyg4scz4k"; }; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ optional alsaSupport alsaLib ++ optional pulseSupport libpulseaudio; diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index 311edbbae89..3ecd4665f26 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU, libGL, cairo, pango, libjack2 }: +{ lib, stdenv, fetchFromGitHub, lv2, pkg-config, libGLU, libGL, cairo, pango, libjack2 }: let name = "sisco.lv2-${version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { srcs = [ src robtkSrc ]; sourceRoot = src.name; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 pango cairo libjack2 libGLU libGL ]; postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk"; diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 5eff8f82e89..84695730db6 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config , alsaLib, asio, avahi, boost170, flac, libogg, libvorbis, soxr , nixosTests }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { sha256 = "152ic8hlyawcmj9pykb33xc6yx7il6yb9ilmsy6m9nlh40m8yxls"; }; - nativeBuildInputs = [ cmake pkgconfig boost170.dev ]; + nativeBuildInputs = [ cmake pkg-config boost170.dev ]; # snapcast also supports building against tremor but as we have libogg, that's # not needed buildInputs = [ diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index bbabaffa7f3..61d1647087e 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , gtk2, alsaLib , fftw, gsl }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "016slh34gb6qqb38m8k9yg48rbhc5p12084szcwvanhh5v7fc7mk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 alsaLib diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix index 87803e68485..b88165f693a 100644 --- a/pkgs/applications/audio/sonic-lineup/default.nix +++ b/pkgs/applications/audio/sonic-lineup/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound , libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate , libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto -, wrapQtAppsHook, pkgconfig +, wrapQtAppsHook, pkg-config }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { portaudio rubberband serd sord capnproto ]; - nativeBuildInputs = [ pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index d80632a08f5..349f4636a79 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -6,7 +6,7 @@ , ruby , aubio , cmake -, pkgconfig +, pkg-config , boost , bash , jack2Full @@ -35,7 +35,7 @@ mkDerivation rec { buildInputs = [ bash cmake - pkgconfig + pkg-config qtbase qwt ruby diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index e9ec7b33f74..135c042d538 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , which , libtool , liblo @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - nativeBuildInputs = [ autoreconfHook pkgconfig which libtool ]; + nativeBuildInputs = [ autoreconfHook pkg-config which libtool ]; buildInputs = [ liblo diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 08cbef146f1..740757a639e 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero +{ lib, stdenv, fetchurl, pkg-config, glib, gtk3, intltool, itstool, libxml2, brasero , libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes , gsettings-desktop-schemas, wrapGAppsHook }: @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "19qg4xv0f9rkq34lragkmhii1llxsa87llbl28i759b0ks4f6sny"; }; - nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index e8704ff6191..1c1724fbce8 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -1,7 +1,7 @@ # currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery { mkDerivation, fetchFromGitHub, fetchpatch, lib, makeWrapper, - cmake, extra-cmake-modules, pkgconfig, + cmake, extra-cmake-modules, pkg-config, libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui, qtbase, phonon, taglib, @@ -63,7 +63,7 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config kdelibs4support makeWrapper ]; propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon]; buildInputs = [ taglib ] ++ runtimeDeps; # encoder plugins go to ${out}/lib so they're found by kbuildsycoca5 diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index f849e2fe7be..fa9860ab248 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -2,7 +2,7 @@ , fetchgit , autoreconfHook , help2man -, pkgconfig +, pkg-config , libsndfile , fftwFloat , libjack2 @@ -32,7 +32,7 @@ stdenv.mkDerivation { LC_ALL = "en_US.UTF-8"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ boost boost.dev ecasound libGLU libGL help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53 diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix index 055ed99dbeb..a368d62ce7d 100644 --- a/pkgs/applications/audio/spectmorph/default.nix +++ b/pkgs/applications/audio/spectmorph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }: +{ lib, stdenv, fetchurl, pkg-config, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }: stdenv.mkDerivation rec { pname = "spectmorph"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "Allows to analyze samples of musical instruments, and to combine them (morphing) to construct hybrid sounds"; diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix index c5e3211a646..12bb972398e 100644 --- a/pkgs/applications/audio/spectrojack/default.nix +++ b/pkgs/applications/audio/spectrojack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libjack2, fftwFloat, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, libjack2, fftwFloat, gtk2 }: stdenv.mkDerivation rec { pname = "spectrojack"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "http://sed.free.fr/spectrojack/${pname}-${version}.tar.gz"; sha256 = "1kiwx0kag7kq7rhg0bvckfm8r7pqmbk76ppa39cq2980jb5v8rfp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 fftwFloat gtk2 ]; configurePhase= '' sed -i 's/.*home.*/#&/' ./Makefile diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix index 34b372f964e..c6536c4d20f 100644 --- a/pkgs/applications/audio/speech-denoiser/default.nix +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lv2, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, lv2, meson, ninja }: let speech-denoiser-src = fetchFromGitHub { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = speech-denoiser-src; - nativeBuildInputs = [ pkgconfig meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ lv2 rnnoise-nu ]; mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2"); diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index d4b83605c32..1a73b8adea7 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "spek"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # needed for autoreconfHook AUTOPOINT="intltoolize --automake --copy"; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; buildInputs = [ ffmpeg wxGTK30-gtk3 wxGTK30-gtk3.gtk ]; diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 6f43dc3f03e..78972effc4d 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, pkgconfig, openssl, python3, libxcb, AppKit, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, pkg-config, openssl, python3, libxcb, AppKit, Security }: rustPlatform.buildRustPackage rec { pname = "spotify-tui"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "100c7x603qyhav3p24clwfal4ngh0258x9lqsi84kcj4wq2f3i8f"; - nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkgconfig python3 ]; + nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ]; buildInputs = [ ] ++ lib.optionals stdenv.isLinux [ openssl libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 84cb64d8cc9..776c9576bb4 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPackages, pkgconfig, openssl +{ lib, fetchFromGitHub, rustPackages, pkg-config, openssl , withALSA ? true, alsaLib ? null , withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null @@ -26,7 +26,7 @@ rustPackages.rustPlatform.buildRustPackage rec { "${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,"}" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional withALSA alsaLib diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix index 06ff5f3909d..b44efc1534f 100644 --- a/pkgs/applications/audio/squishyball/default.nix +++ b/pkgs/applications/audio/squishyball/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, autoreconfHook, fetchsvn, flac, libao, libvorbis, ncurses -, opusfile, pkgconfig +, opusfile, pkg-config }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "013vq52q9z6kpg9iyc2jnb3m2gihcjblvwpg4yj4wy1q2c05pzqp"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ flac libao libvorbis ncurses opusfile ]; diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/pkgs/applications/audio/stone-phaser/default.nix index 7fb4a5410fb..7d12c6cbf34 100644 --- a/pkgs/applications/audio/stone-phaser/default.nix +++ b/pkgs/applications/audio/stone-phaser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, libjack2, mesa, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, libjack2, mesa, pkg-config }: stdenv.mkDerivation rec { pname = "stone-phaser"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 cairo lv2 libjack2 mesa ]; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 53a4cc96437..eb7aac16c64 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -3,7 +3,7 @@ , lib , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , alsaLib , boost , chromaprint @@ -77,7 +77,7 @@ mkDerivation rec { ]) ++ lib.optional withVlc libvlc; - nativeBuildInputs = [ cmake ninja pkgconfig qttools ]; + nativeBuildInputs = [ cmake ninja pkg-config qttools ]; cmakeFlags = [ "-DUSE_SYSTEM_TAGLIB=ON" diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 7d21e816667..6fae14e2b1a 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }: +{ lib, stdenv, fetchurl , glib, pkg-config, libogg, libvorbis, libmad }: stdenv.mkDerivation rec { pname = "streamripper"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libogg libvorbis libmad ]; meta = with lib; { diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix index ccec7b9171f..f2b71c1ce29 100644 --- a/pkgs/applications/audio/swh-lv2/default.nix +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }: +{ lib, stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "swh-lv2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fftwSinglePrec lv2 ]; installPhase = "make install-system"; diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index f10b20bfc3c..8097ee90930 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, pkgconfig, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }: +{ mkDerivation, lib, stdenv, fetchurl, pkg-config, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }: mkDerivation rec { pname = "synthv1"; @@ -11,7 +11,7 @@ mkDerivation rec { buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/talentedhack/default.nix b/pkgs/applications/audio/talentedhack/default.nix index 0dd9a03739d..387fd4f5a0c 100644 --- a/pkgs/applications/audio/talentedhack/default.nix +++ b/pkgs/applications/audio/talentedhack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, lv2, fftwFloat, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, lv2, fftwFloat, pkg-config }: stdenv.mkDerivation rec { pname = "talentedhack"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kwvayalysmk7y49jq0k16al252md8d45z58hphzsksmyz6148bx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 fftwFloat ]; diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix index 399c39acf08..623714e706f 100644 --- a/pkgs/applications/audio/timemachine/default.nix +++ b/pkgs/applications/audio/timemachine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, gtk2 +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, gtk2 , libjack2, libsndfile }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "16fgyw6jnscx9279dczv72092dddghwlp53rkfw469kcgvjhwx0z"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake gtk2 libjack2 libsndfile ]; diff --git a/pkgs/applications/audio/tony/default.nix b/pkgs/applications/audio/tony/default.nix index 8d3ba620f9d..d8265c3161b 100644 --- a/pkgs/applications/audio/tony/default.nix +++ b/pkgs/applications/audio/tony/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, wrapQtAppsHook +{ lib, stdenv, fetchurl, pkg-config, wrapQtAppsHook , alsaLib, boost, bzip2, fftw, fftwFloat, libX11, libfishsound, libid3tag , libjack2, liblo, libmad, libogg, liboggz, libpulseaudio, libsamplerate , libsndfile, lrdf, opusfile, qtbase, qtsvg, rubberband, serd, sord @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "03g2bmlj08lmgvh54dyd635xccjn730g4wwlhpvsw04bffz8b7fp"; }; - nativeBuildInputs = [ pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; buildInputs = [ alsaLib boost bzip2 fftw fftwFloat libX11 libfishsound libid3tag diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index cc3c8c7a0f0..ff10ff13e19 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, flac, lame, zlib, libjpeg, libvorbis, libtheora, libxml2 -, lzo, libdvdread, pkgconfig, x264, libmpeg2, xvidcore }: +, lzo, libdvdread, pkg-config, x264, libmpeg2, xvidcore }: stdenv.mkDerivation rec { name = "transcode-1.1.7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo - libdvdread pkgconfig x264 libmpeg2 xvidcore ]; + libdvdread pkg-config x264 libmpeg2 xvidcore ]; configureFlags = [ "--disable-ffmpeg" "--disable-libavcodec" "--disable-libavformat" "--enable-lzo" "--enable-ogg" "--enable-vorbis" "--enable-theora" "--enable-libxml2" diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index f9395ec6fa2..1cb9795005c 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, cmake, pkgconfig +{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config , alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack }: @@ -11,7 +11,7 @@ mkDerivation { sha256 = "12f7x8kw4fw1j0xkwjrp54cy4cv1ql0zwz2ba5arclk4pf6bhl7q"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ alsaLib fftw flac.dev libjack2 lame libmad libpulseaudio libsamplerate.dev libsndfile.dev libvorbis portaudio qtbase wavpack ]; diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index 44c8b0ecfb5..368731c52b3 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, which, libao, pkgconfig }: +{ lib, stdenv, fetchurl, which, libao, pkg-config }: let version = "2.13"; @@ -9,7 +9,7 @@ in stdenv.mkDerivation { url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2"; sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v"; }; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ libao ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 8e836417f47..c7e24b926c0 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkgconfig +{ lib, stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkg-config , alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi , libzip, rtaudio, rtmidi, speex, libsamplerate }: @@ -74,7 +74,7 @@ with lib; stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ alsaLib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ]; buildFlags = [ "Rack" ]; diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index b0412005aba..e38fc838667 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, mpd_clientlib, ncurses, pcre, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, mpd_clientlib, ncurses, pcre, pkg-config , taglib, curl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0lswzkap2nm7v5h7ppb6a64cb35rajysd09nb204rxgrkij4m6nx"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ mpd_clientlib ncurses pcre taglib curl ]; postInstall = '' diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index fb1046aab52..8c449316674 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -4,7 +4,7 @@ , cmake , ninja , vala -, pkgconfig +, pkg-config , pantheon , gtk3 , glib @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { libxml2 ninja vala - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/audio/vocproc/default.nix b/pkgs/applications/audio/vocproc/default.nix index dce4ed36aac..46957000507 100644 --- a/pkgs/applications/audio/vocproc/default.nix +++ b/pkgs/applications/audio/vocproc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, pkgconfig, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }: +{ lib, stdenv, fetchzip, pkg-config, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }: stdenv.mkDerivation rec { pname = "vocproc"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07a1scyz14mg2jdbw6fpv4qg91zsw61qqii64n9qbnny9d5pn8n2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 fftw lv2-cpp-tools gtkmm2 ]; diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index b50912f26d7..894bed1715f 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkgconfig, curl +{ lib, stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkg-config, curl , speex, flac }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation { done ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libogg libvorbis libao curl speex flac ]; meta = with lib; { diff --git a/pkgs/applications/audio/waon/default.nix b/pkgs/applications/audio/waon/default.nix index 78e4fb1a5c5..970ab087b2c 100644 --- a/pkgs/applications/audio/waon/default.nix +++ b/pkgs/applications/audio/waon/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fftw, gtk2, libao, libsamplerate -, libsndfile, ncurses, pkgconfig +, libsndfile, ncurses, pkg-config }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1xmq8d2rj58xbp4rnyav95y1vnz3r9s9db7xxfa2rd0ilq0ps4y7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fftw gtk2 libao libsamplerate libsndfile ncurses ]; installPhase = '' diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix index e724e934e52..b61ea3fc4d4 100644 --- a/pkgs/applications/audio/wolf-shaper/default.nix +++ b/pkgs/applications/audio/wolf-shaper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkgconfig }: +{ lib, stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkg-config }: stdenv.mkDerivation rec { pname = "wolf-shaper"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 lv2 xorg.libX11 liblo libGL libXcursor ]; makeFlags = [ diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix index b2b9a4c233d..31ef68714f6 100644 --- a/pkgs/applications/audio/x42-avldrums/default.nix +++ b/pkgs/applications/audio/x42-avldrums/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cairo, glib, libGLU, lv2, pango }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cairo, glib, libGLU, lv2, pango }: stdenv.mkDerivation rec { pname = "x42-avldrums"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo glib libGLU lv2 pango ]; makeFlags = [ diff --git a/pkgs/applications/audio/x42-gmsynth/default.nix b/pkgs/applications/audio/x42-gmsynth/default.nix index dad6d05f904..cde67908fde 100644 --- a/pkgs/applications/audio/x42-gmsynth/default.nix +++ b/pkgs/applications/audio/x42-gmsynth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, lv2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, lv2 }: stdenv.mkDerivation rec { pname = "x42-gmsynth"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "08dvdj8r17sfl6l18g2b8abgls2irkbrq5vhrfai01hp2m0rlm34"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib lv2 ]; makeFlags = [ diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 485e0de1ee7..2d2f670d067 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2 , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1av05ykph8x67018hm9zfgh1vk0zi39mvrsxkj6bm4hkarxf0vvl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGLU ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ]; # Don't remove this. The default fails with 'do not know how to unpack source archive' diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index d38faa6925d..b6accf1993a 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, alsaLib, libxmp }: +{ lib, stdenv, fetchurl, pkg-config, alsaLib, libxmp }: stdenv.mkDerivation rec { name = "xmp-4.1.0"; @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib libxmp ]; } diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index e8f6bd94bb4..b994f197e67 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk2, libjack2, -ladspaH, ladspaPlugins, liblo, pkgconfig }: +ladspaH, ladspaPlugins, liblo, pkg-config }: stdenv.mkDerivation rec { pname = "xsynth-dssi"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH - ladspaPlugins liblo pkgconfig ]; + ladspaPlugins liblo pkg-config ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 7f5b0e8d008..e9e191112f9 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub , alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre -, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkgconfig, zlib, xorg +, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkg-config, zlib, xorg }: assert stdenv ? glibc; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { minixml zlib xorg.libpthreadstubs pcre ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; patchPhase = '' substituteInPlace src/Misc/Config.cpp --replace /usr $out diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 82993ec2673..233961ad111 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, libX11, libGL, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: +{ lib, stdenv, fetchFromGitHub, boost, libX11, libGL, liblo, libjack2, ladspaH, lv2, pkg-config, rubberband, libsndfile, fftwFloat, libsamplerate }: stdenv.mkDerivation rec { pname = "zam-plugins"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost libX11 libGL liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ]; postPatch = '' diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix index b9c8512ae13..79742d48a99 100644 --- a/pkgs/applications/blockchains/aeon/default.nix +++ b/pkgs/applications/blockchains/aeon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, git, doxygen, graphviz +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, git, doxygen, graphviz , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline, libsodium }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "07d87n1j4dc9gfwj6xy5jdpryn45095xdh961g6xjnjzc5fivjch"; }; - nativeBuildInputs = [ cmake pkgconfig git doxygen graphviz ]; + nativeBuildInputs = [ cmake pkg-config git doxygen graphviz ]; buildInputs = [ boost miniupnpc openssl unbound diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index a0a7f728315..446aafab8ce 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, openssl, db53, boost +{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, cmake, openssl, db53, boost , zlib, miniupnpc, qtbase ? null , qttools ? null, util-linux, protobuf, qrencode, libevent , withGui, python3, jemalloc, zeromq4 }: @@ -18,7 +18,7 @@ mkDerivation rec { patches = [ ./fix-bitcoin-qt-build.patch ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ openssl db53 boost zlib python3 jemalloc zeromq4 miniupnpc util-linux protobuf libevent ] ++ optionals withGui [ qtbase qttools qrencode ]; diff --git a/pkgs/applications/blockchains/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic.nix index a9bf3f4715b..796c48a7c58 100644 --- a/pkgs/applications/blockchains/bitcoin-classic.nix +++ b/pkgs/applications/blockchains/bitcoin-classic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, qtbase ? null, qttools ? null, util-linux, protobuf, qrencode, libevent , withGui }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "06ij9v7zbdnhxq9429nnxiw655cp8idldj18l7fmj94gqx07n5vh"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc util-linux protobuf libevent ] ++ optionals withGui [ qtbase qttools qrencode ]; diff --git a/pkgs/applications/blockchains/bitcoin-gold.nix b/pkgs/applications/blockchains/bitcoin-gold.nix index c4b7f90cd93..7ff2804ba79 100644 --- a/pkgs/applications/blockchains/bitcoin-gold.nix +++ b/pkgs/applications/blockchains/bitcoin-gold.nix @@ -5,7 +5,7 @@ , libevent , autoreconfHook , db4 -, pkgconfig +, pkg-config , protobuf , hexdump , zeromq @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config hexdump ] ++ optionals withGui [ wrapQtAppsHook diff --git a/pkgs/applications/blockchains/bitcoin-knots.nix b/pkgs/applications/blockchains/bitcoin-knots.nix index a7fb005ea81..eea836ac62d 100644 --- a/pkgs/applications/blockchains/bitcoin-knots.nix +++ b/pkgs/applications/blockchains/bitcoin-knots.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , autoreconfHook , db5 , openssl @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0c8k1154kcwz6q2803wx0zigvqaij1fi5akgfqlj3yl57jjw48jj"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db5 openssl util-linux protobuf boost zlib miniupnpc libevent ]; diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix index ac1c1841806..04c906aefb2 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, util-linux, protobuf, qrencode, libevent, python3 , withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null , Foundation, ApplicationServices, AppKit }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "018a22zbvjqky0whizmgxzscmna0sh2xqgyw02yjk8qj4yi0zp8c"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook python3 ] + nativeBuildInputs = [ pkg-config autoreconfHook python3 ] ++ optionals withGui [ wrapQtAppsHook qttools ]; buildInputs = [ openssl db48 boost zlib miniupnpc util-linux protobuf libevent ] diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix index cd162a8f4b3..7f4e438173b 100644 --- a/pkgs/applications/blockchains/btcdeb/default.nix +++ b/pkgs/applications/blockchains/btcdeb/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , openssl }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0qkmf89z2n7s95vhw3n9vh9dbi14zy4vqw3ffdh1w911jwm5ry3z"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl ]; meta = { diff --git a/pkgs/applications/blockchains/cgminer/default.nix b/pkgs/applications/blockchains/cgminer/default.nix index b7d9bcd583a..250379ee710 100644 --- a/pkgs/applications/blockchains/cgminer/default.nix +++ b/pkgs/applications/blockchains/cgminer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , libtool , autoconf , automake @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "0l1ms3nxnjzh4mpiadikvngcr9k3jnjqy3yna207za0va0c28dj5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool curl ncurses ocl-icd opencl-headers xorg.libX11 xorg.libXext xorg.libXinerama jansson libusb1 ]; diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index 2f3fca79c8d..ef351d0843f 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, pkgconfig, which, libtool, autoconf, automake, +{ lib, stdenv, python3, pkg-config, which, libtool, autoconf, automake, autogen, sqlite, gmp, zlib, fetchurl, unzip, fetchpatch, gettext }: with lib; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoconf autogen automake libtool pkgconfig which unzip gettext ]; + nativeBuildInputs = [ autoconf autogen automake libtool pkg-config which unzip gettext ]; buildInputs = let py3 = python3.withPackages (p: [ p.Mako ]); in [ sqlite gmp zlib py3 ]; diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix index 6b122d502c3..ca1dd13e425 100644 --- a/pkgs/applications/blockchains/dashpay.nix +++ b/pkgs/applications/blockchains/dashpay.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, pkgconfig, autoreconfHook +{ fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook , openssl, db48, boost, zlib, miniupnpc , qrencode, glib, protobuf, yasm, libevent , util-linux @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0l1gcj2xf2bal9ph9y11x8yd28fd25f55f48xbm45bfw3ij7nbaa"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib openssl db48 yasm boost zlib libevent miniupnpc protobuf qrencode util-linux ]; diff --git a/pkgs/applications/blockchains/dero.nix b/pkgs/applications/blockchains/dero.nix index 373170fe8ff..6b15cbd0a16 100644 --- a/pkgs/applications/blockchains/dero.nix +++ b/pkgs/applications/blockchains/dero.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost , lmdb, miniupnpc, readline }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1v8b9wbmqbpyf4jpc0v276qzk3hc5fpddcmwvv5k5yfi30nmbh5c"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; meta = with lib; { diff --git a/pkgs/applications/blockchains/digibyte.nix b/pkgs/applications/blockchains/digibyte.nix index 97bf97bb340..acf0b355e64 100644 --- a/pkgs/applications/blockchains/digibyte.nix +++ b/pkgs/applications/blockchains/digibyte.nix @@ -5,7 +5,7 @@ , libevent , autoreconfHook , db4 -, pkgconfig +, pkg-config , protobuf , hexdump , zeromq @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config hexdump ] ++ optionals withGui [ wrapQtAppsHook diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix index 2a01288e4de..88439d6bdbf 100644 --- a/pkgs/applications/blockchains/dogecoin.nix +++ b/pkgs/applications/blockchains/dogecoin.nix @@ -1,5 +1,5 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig, autoreconfHook +, pkg-config, autoreconfHook , db5, openssl, boost, zlib, miniupnpc, libevent , protobuf, util-linux, qt4, qrencode , withGui }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1gw46q63mjzwvb17ck6p1bap2xpdrap08szw2kjhasa3yvd5swyy"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db5 openssl util-linux protobuf boost zlib miniupnpc libevent ] ++ optionals withGui [ qt4 qrencode ]; diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix index 342f14c7df6..c80ef342c75 100644 --- a/pkgs/applications/blockchains/litecoin.nix +++ b/pkgs/applications/blockchains/litecoin.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchFromGitHub -, pkgconfig, autoreconfHook +, pkg-config, autoreconfHook , openssl, db48, boost, zlib, miniupnpc , glib, protobuf, util-linux, qrencode , AppKit @@ -22,7 +22,7 @@ mkDerivation rec { sha256 = "11753zhyx1kmrlljc6kbjwrcb06dfcrsqvmw3iaki9a132qk6l5c"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib zeromq miniupnpc glib protobuf util-linux libevent ] ++ optionals stdenv.isDarwin [ AppKit ] diff --git a/pkgs/applications/blockchains/masari.nix b/pkgs/applications/blockchains/masari.nix index 25301a87aea..bf995da36af 100644 --- a/pkgs/applications/blockchains/masari.nix +++ b/pkgs/applications/blockchains/masari.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost , lmdb, miniupnpc, readline }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0l6i21wkq5f6z8xr756i7vqgkzk7lixaa31ydy34fkfcqxppgxz3"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; meta = with lib; { diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 5165c61b070..9bf1ca586c2 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, wrapQtAppsHook, makeDesktopItem , fetchFromGitHub -, cmake, qttools, pkgconfig +, cmake, qttools, pkg-config , qtbase, qtdeclarative, qtgraphicaleffects , qtmultimedia, qtxmlpatterns , qtquickcontrols, qtquickcontrols2 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig wrapQtAppsHook + cmake pkg-config wrapQtAppsHook (getDev qttools) ]; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 48d1952192d..41931bc9ec3 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, cmake, pkgconfig +, cmake, pkg-config , boost, miniupnpc, openssl, unbound , zeromq, pcsclite, readline, libsodium, hidapi , randomx, rapidjson @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cp -r . $source ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost miniupnpc openssl unbound diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix index 77f72f4824b..dccee1dc056 100644 --- a/pkgs/applications/blockchains/namecoin.nix +++ b/pkgs/applications/blockchains/namecoin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, qrencode, hexdump +{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, qt4, protobuf, qrencode, hexdump , withGui }: with lib; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config hexdump ]; diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index 664e2674062..60ad51152f6 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook, boost, libGL +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL , qtbase}: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { optionToFlag = name: value: "-D${name}=${value}"; in lib.mapAttrsToList optionToFlag options; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ boost libGL qtbase ]; buildPhase = '' diff --git a/pkgs/applications/blockchains/particl/particl-core.nix b/pkgs/applications/blockchains/particl/particl-core.nix index cadd64b289b..2c17b344664 100644 --- a/pkgs/applications/blockchains/particl/particl-core.nix +++ b/pkgs/applications/blockchains/particl/particl-core.nix @@ -6,7 +6,7 @@ , libevent , miniupnpc , openssl -, pkgconfig +, pkg-config , zeromq , zlib , unixtools @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "11y5q2srkh6r2samppjb5mg6hl79y16j2lj1r23p0968vb9c45kl"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc libevent zeromq unixtools.hexdump python3 ]; configureFlags = [ diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index 92f548789bf..58986a10676 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, pkgconfig, autoreconfHook, wrapQtAppsHook ? null +{ fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook, wrapQtAppsHook ? null , openssl, db48, boost, zlib, miniupnpc, gmp , qrencode, glib, protobuf, yasm, libevent , util-linux, qtbase ? null, qttools ? null @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "03ndk46h6093v8s18d5iffz48zhlshq7jrk6vgpjfs6z2iqgd2sy"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ]; buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf util-linux ] ++ optionals withGui [ qtbase qttools qrencode ]; diff --git a/pkgs/applications/blockchains/stellar-core.nix b/pkgs/applications/blockchains/stellar-core.nix index 925942c56e9..ceb48bf6aa4 100644 --- a/pkgs/applications/blockchains/stellar-core.nix +++ b/pkgs/applications/blockchains/stellar-core.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoconf, libtool, automake, pkgconfig, git +{ lib, stdenv, fetchgit, autoconf, libtool, automake, pkg-config, git , bison, flex, postgresql }: let @@ -16,7 +16,7 @@ in stdenv.mkDerivation { leaveDotGit = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool git ]; propagatedBuildInputs = [ bison flex postgresql ]; diff --git a/pkgs/applications/blockchains/vertcoin.nix b/pkgs/applications/blockchains/vertcoin.nix index d56126902b6..acb02298e11 100644 --- a/pkgs/applications/blockchains/vertcoin.nix +++ b/pkgs/applications/blockchains/vertcoin.nix @@ -5,7 +5,7 @@ , libevent , autoreconfHook , db4 -, pkgconfig +, pkg-config , protobuf , hexdump , zeromq @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config hexdump ] ++ optionals withGui [ wrapQtAppsHook diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix index 88f22bf9e7d..5f8c56592f6 100644 --- a/pkgs/applications/editors/amp/default.nix +++ b/pkgs/applications/editors/amp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, python3, xorg, cmake, libgit2, darwin +{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, python3, xorg, cmake, libgit2, darwin , curl }: rustPlatform.buildRustPackage rec { @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "09v991rl2w4c4jh7ga7q1lk6wyl2vr71j5cpniij8mcvszrz78qf"; - nativeBuildInputs = [ cmake pkgconfig python3 ]; + nativeBuildInputs = [ cmake pkg-config python3 ]; buildInputs = [ openssl xorg.libxcb libgit2 ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ curl Security AppKit ]); diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index cb8e9b7e3bb..4265e0ef104 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, cmake -, wrapGAppsHook, pkgconfig, desktop-file-utils +, wrapGAppsHook, pkg-config, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection , gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive , shared-mime-info, haskellPackages}: @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { sha256 = "06bl1hc69ixk2vcb2ig74mwid14sl5zq6rfna7lx9na6j3l04879"; }; - nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils + nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils appstream-glib wrapGAppsHook ]; buildInputs = [ glib pythonEnv gobject-introspection gtk3 diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index b44dc7c6d4f..58342ab1393 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, fetchFromGitHub, fetchpatch, cmake, ninja, pkgconfig +{ stdenv, lib, callPackage, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config , curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib , harfbuzzFull, glib, fontconfig, pcre , libX11, libXext, libXcursor, libXxf86vm, libGL @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig + cmake pkg-config ] ++ lib.optionals unfree [ ninja ]; buildInputs = [ diff --git a/pkgs/applications/editors/bless/default.nix b/pkgs/applications/editors/bless/default.nix index ab5f2ccc104..24fc8440bbd 100644 --- a/pkgs/applications/editors/bless/default.nix +++ b/pkgs/applications/editors/bless/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , mono , gtk-sharp-2_0 , gettext @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook gettext makeWrapper diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 21da4de9c6d..2507cb13d7a 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkgconfig , gtk, libxml2 +{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2 , enchant, gucharmap, python, gnome3 }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0slyjx4b4l612505q02crk00pjg9d5wi8gm5gxvcs0f6l9dr1y8d"; }; - nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ]; buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2 enchant gucharmap python ]; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 106ddb515ed..5784e7d50a4 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, libtool, pkgconfig, file, zip, wxGTK, gtk2 +{ lib, stdenv, fetchurl, autoreconfHook, libtool, pkg-config, file, zip, wxGTK, gtk2 , contribPlugins ? false, hunspell, gamin, boost }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1q2pph7md1p10i83rir2l4gvy7ym2iw8w6sk5vl995knf851m20k"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libtool file zip ]; + nativeBuildInputs = [ autoreconfHook pkg-config libtool file zip ]; buildInputs = [ wxGTK gtk2 ] ++ optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix index ff4dcca8935..25e620c51e4 100644 --- a/pkgs/applications/editors/edit/default.nix +++ b/pkgs/applications/editors/edit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, unzip, pkgconfig, ncurses, libX11, libXft, cwebbin }: +{ lib, stdenv, fetchgit, unzip, pkg-config, ncurses, libX11, libXft, cwebbin }: stdenv.mkDerivation { pname = "edit-nightly"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ unzip - pkgconfig + pkg-config ncurses libX11 libXft diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 93e215753c7..bc0875bcd9e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -144,7 +144,7 @@ let flycheck-rtags = fix-rtags super.flycheck-rtags; pdf-tools = super.pdf-tools.overrideAttrs (old: { - nativeBuildInputs = [ external.pkgconfig ]; + nativeBuildInputs = [ external.pkg-config ]; buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ]; preBuild = "make server/epdfinfo"; recipe = pkgs.writeText "recipe" '' @@ -373,7 +373,7 @@ let nativeBuildInputs = [ external.autoconf external.automake - external.pkgconfig + external.pkg-config external.libtool (external.zeromq.override { enableDrafts = true; }) ]; diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index eef98943c3b..37707996919 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -7,7 +7,7 @@ , patches ? [ ] }: { stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm -, Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif +, Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , jansson, harfbuzz @@ -92,7 +92,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { "" ]; - nativeBuildInputs = [ pkgconfig makeWrapper ] + nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals srcRepo [ autoreconfHook texinfo ] ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index dd9a6673458..3c57d3bc81a 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake, jansson +{ lib, stdenv, fetchurl, ncurses, pkg-config, texinfo, libxml2, gnutls, gettext, autoconf, automake, jansson , AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit , ImageCaptureCore, GSS, ImageIO # These may be optional }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoconf automake ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; buildInputs = [ ncurses libxml2 gnutls texinfo gettext jansson AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index dee0fe72ebb..059d49151d8 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, pkgconfig, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: +{ lib, stdenv, mkDerivation, pkg-config, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: mkDerivation rec { pname = "featherpad"; version = "0.10.0"; @@ -10,7 +10,7 @@ mkDerivation rec { sha256 = "1wrbs6kni9s3x39cckm9kzpglryxn5vyarilvh9pafbzpc6rc57p"; }; - nativeBuildInputs = [ qmake pkgconfig qttools ]; + nativeBuildInputs = [ qmake pkg-config qttools ]; buildInputs = [ qtbase qtsvg qtx11extras ]; meta = with lib; { diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 1a5ce245153..31a7026106e 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: +{ lib, stdenv, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: mkDerivation rec { pname = "focuswriter"; @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "0h85f6cs9zbxv118mjfxqfv41j19zkx2xq36mpnlmrlzkjj7dx9l"; }; - nativeBuildInputs = [ pkgconfig qmake qttools ]; + nativeBuildInputs = [ pkg-config qmake qttools ]; buildInputs = [ hunspell qtbase qtmultimedia ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index e6752386718..e77b63218c3 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -2,7 +2,7 @@ , fetchurl , gtk3 , which -, pkgconfig +, pkg-config , intltool , file , libintl @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool libintl which diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 4da73d0d2e6..f0ae7ef5f3e 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebengine, hunspell }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, qttools, qtwebengine, hunspell }: mkDerivation rec { pname = "ghostwriter"; @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "sha256-Ag97iE++f3nG2zlwqn0qxSL9RpF8O3XWH9NtQ5kFuWg="; }; - nativeBuildInputs = [ qmake pkgconfig qttools ]; + nativeBuildInputs = [ qmake pkg-config qttools ]; buildInputs = [ qtwebengine hunspell ]; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 4c36dcfda11..198185e469d 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -25,7 +25,7 @@ , ostree , pcre , pcre2 -, pkgconfig +, pkg-config , python3 , sysprof , template-glib @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config python3 python3.pkgs.wrapPython wrapGAppsHook diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index d9e09bf0d89..7967b78f13c 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee -, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: +, tepl, amtk, gnome3, glib, pkg-config, intltool, itstool, libxml2 }: let version = "3.38.0"; pname = "gnome-latex"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation { configureFlags = ["--disable-dconf-migration"]; nativeBuildInputs = [ - pkgconfig + pkg-config wrapGAppsHook itstool intltool diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index d4710094e4f..0e2671846c0 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,5 +1,5 @@ { avahiSupport ? false # build support for Avahi in libinfinity -, lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook, yelp-tools +, lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook, yelp-tools , gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }: let @@ -13,7 +13,7 @@ in stdenv.mkDerivation { sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az"; }; - nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool yelp-tools wrapGAppsHook ]; + nativeBuildInputs = [ autoconf automake pkg-config intltool itstool yelp-tools wrapGAppsHook ]; buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix index f3671cc7b3a..2c959519f41 100644 --- a/pkgs/applications/editors/howl/default.nix +++ b/pkgs/applications/editors/howl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, gtk3, librsvg }: +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, gtk3, librsvg }: with lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # The Makefile uses "/usr/local" if not explicitly overridden installFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ gtk3 librsvg ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 5f2cf75ff37..95b41ba5caf 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm, - boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, + boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkg-config, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3, coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0xp6ijnrggskjrvscp204bmdpz48l5a8nxr9abp17wni6akb5wiq"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ dbus openssl diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 3c0a8bafa7e..93a9e1a05a6 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkg-config }: with lib; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "091qzk0qs7hql0q51hix99srgma35mhdnjfd5ncfba1bmc1h8x5i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses asciidoc docbook_xsl libxslt ]; makeFlags = [ "debug=no" ]; diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix index 4bd377444d0..cb1265735f9 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig, extra-cmake-modules, qtbase }: +{ lib, stdenv, fetchurl, cmake, pkg-config, extra-cmake-modules, qtbase }: let pname = "kdevelop-pg-qt"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1"; }; - nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; + nativeBuildInputs = [ cmake pkg-config extra-cmake-modules ]; buildInputs = [ qtbase ]; diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 8ca083a2d89..b54015de7b8 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -1,5 +1,5 @@ -{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules +{ mkDerivation, lib, fetchurl, cmake, gettext, pkg-config, extra-cmake-modules , qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor @@ -18,7 +18,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - cmake gettext pkgconfig extra-cmake-modules makeWrapper + cmake gettext pkg-config extra-cmake-modules makeWrapper ]; buildInputs = [ diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index d37a2de2866..2f53df97d32 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, gtk2 }: +{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2 }: stdenv.mkDerivation rec { version = "0.8.18.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 8878e01de67..ea5e162fdde 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, buildPackages }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, buildPackages }: stdenv.mkDerivation rec { pname = "mg"; @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = [ "PKG_CONFIG=${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config" ]; + makeFlags = [ "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" ]; installPhase = '' install -m 555 -Dt $out/bin mg install -m 444 -Dt $out/share/man/man1 mg.1 ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index ed6695b9979..e5fde3e501e 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, autoconf, automake, pkgconfig, shared-mime-info, intltool +, autoconf, automake, pkg-config, shared-mime-info, intltool , glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip , dotnetPackages }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { patchFlags = [ "-p2" ]; patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake shared-mime-info intltool mono gtk-sharp-2_0 gnome-sharp unzip diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 427e11ca642..3e5de3d5fc1 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv -, libuv, lua, ncurses, pkgconfig +, libuv, lua, ncurses, pkg-config , unibilium, xsel, gperf , libvterm-neovim , glibcLocales ? null, procps ? null @@ -74,7 +74,7 @@ in nativeBuildInputs = [ cmake gettext - pkgconfig + pkg-config ]; # extra programs test via `make functionaltest` diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index cd4fe34ef33..545d64ef512 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }: +{ mkDerivation, lib, fetchFromGitHub, pkg-config, which, qtbase, qtsvg, qttools, qtwebkit }: mkDerivation rec { pname = "notepadqq"; @@ -12,7 +12,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig which qttools + pkg-config which qttools ]; buildInputs = [ diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 48d509be41a..2d04ad1629c 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, pkgconfig, meson, ninja, python3, vala +{ lib, stdenv, fetchFromGitHub, nix-update-script, pkg-config, meson, ninja, python3, vala , gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon , libgee, discount, wrapGAppsHook }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 0b72a57df3e..3d6ec9ece9c 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, gtk2 }: stdenv.mkDerivation { pname = "scite"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0h16wk2986nkkhhdv5g4lxlcn02qwyja24x1r6vf02r1hf46b9q2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; sourceRoot = "scintilla/gtk"; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 8e662d55523..1094c3c7553 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, makeWrapper +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, makeWrapper , boost, xercesc, hunspell, zlib, pcre16 , qtbase, qttools, qtwebengine, qtxmlpatterns , python3Packages @@ -17,7 +17,7 @@ mkDerivation rec { pythonPath = with python3Packages; [ lxml ]; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ boost xercesc qtbase qttools qtwebengine qtxmlpatterns diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index b42ebe19f64..e474ff5f19b 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }: +{ lib, stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkg-config, makeWrapper, gnome2, gtk2 }: stdenv.mkDerivation { version = "git-2014-08-20"; pname = "supertux-editor"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [mono gtk-sharp-2_0 makeWrapper gnome2.libglade gtk2 ]; installPhase = '' diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index f967f28f4df..6046a3aa313 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -7,7 +7,7 @@ git ? null, python3 ? null, cmake, - pkgconfig, + pkg-config, ghostscriptX ? null, extraFonts ? false, chineseFonts ? false, @@ -31,7 +31,7 @@ mkDerivation { sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ guile_1_8 qtbase diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 0b78ff54c35..28b04723eae 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchurl, qtbase, qtscript, qmake, zlib, pkgconfig, poppler }: +{ lib, mkDerivation, fetchurl, qtbase, qtscript, qmake, zlib, pkg-config, poppler }: mkDerivation rec { pname = "texmaker"; @@ -10,7 +10,7 @@ mkDerivation rec { }; buildInputs = [ qtbase qtscript poppler zlib ]; - nativeBuildInputs = [ pkgconfig poppler qmake ]; + nativeBuildInputs = [ pkg-config poppler qmake ]; NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler"; qmakeFlags = [ diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 101c9bc59f9..988e32ae712 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtscript, qtsvg, - wrapQtAppsHook, poppler, zlib, pkgconfig }: + wrapQtAppsHook, poppler, zlib, pkg-config }: mkDerivation rec { pname = "texstudio"; @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "05q70wbdaldhrlapss4agmvz1cwqd229nd5amkj069v1wxrkvpb7"; }; - nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ]; + nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; buildInputs = [ qtbase qtscript qtsvg poppler zlib ]; qmakeFlags = [ "NO_APPDATA=True" ]; diff --git a/pkgs/applications/editors/textadept/10/default.nix b/pkgs/applications/editors/textadept/10/default.nix index 4450fe77d18..9d86bdc4c5b 100644 --- a/pkgs/applications/editors/textadept/10/default.nix +++ b/pkgs/applications/editors/textadept/10/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }: +{ lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }: stdenv.mkDerivation rec { version = "10.8"; pname = "textadept"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ncurses glib unzip zip ]; diff --git a/pkgs/applications/editors/textadept/11/default.nix b/pkgs/applications/editors/textadept/11/default.nix index 017a2970c30..a0037ca6c2b 100644 --- a/pkgs/applications/editors/textadept/11/default.nix +++ b/pkgs/applications/editors/textadept/11/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchhg, fetchFromGitHub, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }: +{ lib, stdenv, fetchhg, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }: stdenv.mkDerivation rec { version = "11.0_beta"; pname = "textadept11"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ncurses glib unzip zip ]; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index b58f5da6a96..f5306e75a56 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake +{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, qmake , python, qtbase, qttools }: mkDerivation rec { @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "0n8p7bp5pqq72c65av3v7wbazwphh78pw27nqvpiyp9y8k5w4pg0"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ python qtbase qttools ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index eb015550c39..e611e486288 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,4 +1,4 @@ -{ source ? "default", callPackage, lib, stdenv, ncurses, pkgconfig, gettext +{ source ? "default", callPackage, lib, stdenv, ncurses, pkg-config, gettext , writeText, config, glib, gtk2-x11, gtk3-x11, lua, python3, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE @@ -119,7 +119,7 @@ in stdenv.mkDerivation rec { ++ lib.optional ximSupport "--enable-xim"; nativeBuildInputs = [ - pkgconfig + pkg-config ] ++ lib.optional wrapPythonDrv makeWrapper ++ lib.optional nlsSupport gettext diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 9b141992435..48e1369c8c3 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, callPackage, ncurses, gettext, pkgconfig +{ lib, stdenv, fetchurl, callPackage, ncurses, gettext, pkg-config # default vimrc , vimrc ? fetchurl { name = "default-vimrc"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; - nativeBuildInputs = [ gettext pkgconfig ]; + nativeBuildInputs = [ gettext pkg-config ]; buildInputs = [ ncurses ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index e950e7685ef..c71f057fe0f 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, runCommand, ncurses, gettext -, pkgconfig, cscope, ruby, tcl, perl, luajit +, pkg-config, cscope, ruby, tcl, perl, luajit , darwin , usePython27 ? false @@ -38,7 +38,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig buildSymlinks ]; + nativeBuildInputs = [ pkg-config buildSymlinks ]; buildInputs = [ gettext ncurses cscope luajit ruby tcl perl python.pkg ]; diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index f1211269234..9a020233f3b 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem +{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, makeDesktopItem , ncurses, libtermkey, lpeg, lua , acl ? null, libselinux ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "martanne"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ ncurses diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 414c08d27f9..65f42d7c53f 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw +{ stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw , cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1amjk9rz7vw5ha7nyl5j2bfwj5if9w62nlwx5qbp1x7spldimlll"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj readline ffmpeg_3 makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas libLAS proj-datumgrid ] diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 9d52046ba0c..ee608b7538f 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool +{ lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices @@ -50,7 +50,7 @@ stdenv.mkDerivation { [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM ; - nativeBuildInputs = [ pkgconfig libtool ]; + nativeBuildInputs = [ pkg-config libtool ]; buildInputs = [ zlib fontconfig freetype ghostscript @@ -72,7 +72,7 @@ stdenv.mkDerivation { moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params for file in "$dev"/bin/*-config; do substituteInPlace "$file" --replace pkg-config \ - "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config'" + "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'" done '' + lib.optionalString (ghostscript != null) '' for la in $out/lib/*.la; do diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 42f157e5313..ad559a6f216 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices @@ -62,7 +62,7 @@ stdenv.mkDerivation { [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM ; - nativeBuildInputs = [ pkgconfig libtool ]; + nativeBuildInputs = [ pkg-config libtool ]; buildInputs = [ zlib fontconfig freetype ghostscript @@ -85,10 +85,10 @@ stdenv.mkDerivation { moveToOutput "bin/*-config" "$dev" moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params for file in "$dev"/bin/*-config; do - substituteInPlace "$file" --replace "${pkgconfig}/bin/pkg-config -config" \ - ${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config - substituteInPlace "$file" --replace ${pkgconfig}/bin/pkg-config \ - "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config'" + substituteInPlace "$file" --replace "${pkg-config}/bin/pkg-config -config" \ + ${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config + substituteInPlace "$file" --replace ${pkg-config}/bin/pkg-config \ + "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'" done '' + lib.optionalString (ghostscript != null) '' for la in $out/lib/*.la; do diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index ec146767a6a..0a611515b0d 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, pkgconfig, libconfig +{ config, lib, stdenv, fetchFromGitHub, pkg-config, libconfig , gtkmm2, glibmm, libxml2, libsecret, curl, libzip , librsvg, gst_all_1, autoreconfHook, makeWrapper , useUnrar ? config.ahoviewer.useUnrar or false, unrar @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2 libsecret curl libzip librsvg diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/applications/graphics/akira/default.nix index 4d0cc46bb59..c2d8a4bda35 100644 --- a/pkgs/applications/graphics/akira/default.nix +++ b/pkgs/applications/graphics/akira/default.nix @@ -6,7 +6,7 @@ , meson , ninja , pantheon -, pkgconfig +, pkg-config , python3 , vala , vala-lint @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala vala-lint diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index 5e8e1e63344..e3b966353ff 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, callPackage, libpng12, imagemagick -, autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin +, autoreconfHook, glib, pstoedit, pkg-config, gettext, gd, darwin , runtimeShell }: # TODO: Figure out why the resultant binary is somehow linked against @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { #''; autofig = callPackage ./autofig.nix {}; - nativeBuildInputs = [ autoreconfHook glib autofig pkgconfig gettext ]; + nativeBuildInputs = [ autoreconfHook glib autofig pkg-config gettext ]; buildInputs = [ libpng12 imagemagick pstoedit ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ gd ApplicationServices ]); diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 550b23173fc..0f47b87d4ac 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, libsoup, graphicsmagick, json-glib, wrapGAppsHook , cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg -, libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt +, libpng, librsvg, libtiff, openexr, osm-gps-map, pkg-config, sqlite, libxslt , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 , ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "6dd3de1f5ea9f94af92838c0be5ff30fdaa599aa1d737dcb562f9e0b2b2dbdda"; }; - nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; + nativeBuildInputs = [ cmake ninja llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; buildInputs = [ cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 2648828cfdc..6fe8aed8f67 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perlPackages, +{ lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkg-config, perlPackages, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, gtk-mac-integration-gtk2 }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { ++ lib.optional withGNOME libgnomeui ++ lib.optional stdenv.isDarwin gtk-mac-integration-gtk2; - nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool ] + nativeBuildInputs = [ autoconf automake libtool pkg-config intltool ] ++ (with perlPackages; [ perl XMLParser ]); preConfigure = '' diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index 9437d04108c..d1cee064aee 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -1,7 +1,7 @@ { python2 , lib, stdenv , fetchurl -, pkgconfig +, pkg-config , libXext , libXxf86vm , libX11 @@ -38,7 +38,7 @@ in buildPythonApplication rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; preConfigure = '' diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 1b475df92a6..ef100e5f7bd 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , mkDerivation , fetchurl -, pkgconfig +, pkg-config , djvulibre , qtbase , qttools @@ -20,7 +20,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config qttools ]; diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index a0d28689ae7..0feb72f64aa 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config , python3 , gtk3 , appstream-glib @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection meson ninja - pkgconfig + pkg-config wrapGAppsHook glib gettext diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix index 75f1fb9acd1..942a6d63bd5 100644 --- a/pkgs/applications/graphics/epeg/default.nix +++ b/pkgs/applications/graphics/epeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake +{ lib, stdenv, fetchFromGitHub, pkg-config, libtool, autoconf, automake , libjpeg, libexif }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig libtool autoconf automake ]; + nativeBuildInputs = [ pkg-config libtool autoconf automake ]; propagatedBuildInputs = [ libjpeg libexif ]; diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index 12e4ec4496d..c31c1407da7 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU, libGL, ctl }: +{ lib, stdenv, fetchurl, pkg-config, fltk, openexr, libGLU, libGL, ctl }: stdenv.mkDerivation { name ="openexr_viewers-2.2.1"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openexr fltk libGLU libGL ctl ]; meta = { diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index c50b6d0c2ad..1985176765f 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, openexr, libpng12, libjpeg }: +{ lib, stdenv, fetchurl, pkg-config, openexr, libpng12, libjpeg }: stdenv.mkDerivation rec { pname = "exrtools"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ stdenv openexr libpng12 libjpeg ]; meta = with lib; { diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 4754cc1a024..9ed6ee75159 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm -, pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm +, pkg-config, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm , epoxy, poppler, mesa, lirc }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm"; }; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index 6aa84846f3a..49e8fee513d 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -3,7 +3,7 @@ , nix-update-script , pantheon , vala -, pkgconfig +, pkg-config , meson , ninja , python3 @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index ebf8b9ee606..3563220f2b8 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook, opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, -gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }: +gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi ? null }: assert mpi != null; @@ -21,7 +21,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake ninja - pkgconfig + pkg-config pythonPackages.pyside2-tools wrapQtAppsHook ]; diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index 34391754e7f..0e79f981fbc 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, gtk2, perlPackages, pkgconfig } : +{lib, stdenv, fetchurl, gtk2, perlPackages, pkg-config } : let version = "0.4"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { [ ./gcolor2-amd64.patch ] else [ ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index f107d492434..ff1df143141 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool +{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida , wrapGAppsHook, fetchpatch }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool + nativeBuildInputs = [ pkg-config autoconf automake gettext intltool wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 4ba7cb8eb03..62f1a362771 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -3,7 +3,7 @@ , fetchurl , substituteAll , autoreconfHook -, pkgconfig +, pkg-config , intltool , babl , gegl @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook # hardcode-plugin-interpreters.patch changes Makefile.am - pkgconfig + pkg-config intltool gettext makeWrapper diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 37387e2a720..33337739364 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, barcode, gnome3, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas -, intltool, itstool, makeWrapper, pkgconfig, yelp-tools +, intltool, itstool, makeWrapper, pkg-config, yelp-tools }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ]; buildInputs = [ barcode gtk3 gtk-doc yelp-tools gnome3.gnome-common gsettings-desktop-schemas diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index b2923143017..a710d6c1e47 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -27,7 +27,7 @@ , meson , ninja , nixosTests -, pkgconfig +, pkg-config , python3 , tracker , tracker-miners @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config (python3.withPackages (pkgs: with pkgs; [ dogtail pygobject3 diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index e4a82703feb..a1b4accc8d5 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkg-config }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { homepage = "https://launchpad.net/gnuclad"; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index ec51e077c56..64ea533eefd 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, scons, pkg-config, wrapGAppsHook , glfw3, gtk3, libpng12 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./disable-imgui_ini.patch ]; - nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ scons pkg-config wrapGAppsHook ]; buildInputs = [ glfw3 gtk3 libpng12 ]; NIX_LDFLAGS = "-lpthread"; diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index e686aa4f359..b661ba562f9 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, gtk2, fetchpatch }: +{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2, fetchpatch }: stdenv.mkDerivation { name = "gpicview-0.2.4"; @@ -24,6 +24,6 @@ stdenv.mkDerivation { platforms = platforms.unix; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool gtk2 ]; } diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 6ea67e33212..39f7a42b3b3 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -1,6 +1,6 @@ -{lib, stdenv, fetchurl, pkgconfig, gtk2, libpng}: +{lib, stdenv, fetchurl, pkg-config, gtk2, libpng}: -assert pkgconfig != null && gtk2 != null && libpng != null; +assert pkg-config != null && gtk2 != null && libpng != null; # Note that we cannot just copy gtk's png attribute, since gtk might # not be linked against png. # !!! assert libpng == gtk2.libpng; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libpng]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index 961cc7e49f7..3529f827b4a 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, zlib, libpng, pkgconfig, lua5 }: +{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, zlib, libpng, pkg-config, lua5 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 ]; preBuild = "cd src"; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 538e665be25..cefb9c03dc0 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , gnome3 -, pkgconfig +, pkg-config , meson , ninja , exiv2 @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { itstool meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix index d888e55ed3d..9f2f050441f 100644 --- a/pkgs/applications/graphics/guetzli/default.nix +++ b/pkgs/applications/graphics/guetzli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, libpng, fetchFromGitHub, pkgconfig }: +{ lib, stdenv, libpng, fetchFromGitHub, pkg-config }: let version = "1.0.1"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { rev = "v${version}"; sha256 = "1wy9wfvyradp0aigfv8yijvj0dgb5kpq2yf2xki15f605jc1r5dm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng ]; installPhase = '' diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 17d1dc32676..f7f1e17be22 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig, fetchpatch +{ lib, stdenv, cmake, fetchurl, gnumake, makeWrapper, pkg-config, fetchpatch , autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext , glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi , libXmu, libGLU, libGL, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { wxGTK zlib ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index fbee1d5b0e8..f78170fde34 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -3,7 +3,7 @@ , nix-update-script , fetchpatch , vala -, pkgconfig +, pkg-config , python3 , glib , gtk3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 067abb785b4..3f6a27cbc76 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -8,7 +8,7 @@ , fontconfig , meson , ninja -, pkgconfig +, pkg-config , icu , pango , inih @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 161260bcea9..2c9430ded73 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, zlib, freetype, cairo, lua5, texlive, ghostscript , libjpeg, libpng, qtbase, mkDerivation }: @@ -20,7 +20,7 @@ mkDerivation rec { libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; qtWrapperArgs = [ ''--prefix PATH : ${texlive}/bin'' ]; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index c333ecaa99f..99e56738dbf 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc , cmake, ninja, libGLU, libGL, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype -, libpng, boost, doxygen, cairomm, pkgconfig, libjpeg, libtiff +, libpng, boost, doxygen, cairomm, pkg-config, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, libXmu }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" ''; - nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkgconfig perl asciidoc ]; + nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkg-config perl asciidoc ]; buildInputs = [ libGLU libGL zlib python expat libxml2 libsigcxx libuuid freetype libpng diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 4f3e08bf7b0..283ed117954 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook +{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook , kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons , qtbase, qtsvg , boost, graphviz @@ -19,7 +19,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - cmake extra-cmake-modules pkgconfig wrapGAppsHook + cmake extra-cmake-modules pkg-config wrapGAppsHook kdoctools ]; diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index 1872d976f8e..7cdf32cc8e7 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, pkgconfig, wrapQtAppsHook +, pkg-config, wrapQtAppsHook , poppler, gnuplot , qmake, qtbase, qttools }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig qttools qmake wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config qttools qmake wrapQtAppsHook ]; QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; buildInputs = [ qtbase poppler ]; diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 9b1dbe53795..36154af137b 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, cmake, fetchFromGitHub, pkgconfig +{ lib, stdenv, mkDerivation, cmake, fetchFromGitHub, pkg-config , boost, exiv2, fftwFloat, gsl , ilmbase, lcms2, libraw, libtiff, openexr , qtbase, qtdeclarative, qttools, qtwebengine, eigen @@ -22,7 +22,7 @@ mkDerivation rec { boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { homepage = "http://qtpfsgui.sourceforge.net/"; diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix index 5bc67a8c63b..af6b812e1e5 100644 --- a/pkgs/applications/graphics/mozjpeg/default.nix +++ b/pkgs/applications/graphics/mozjpeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libpng, nasm }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libpng, nasm }: stdenv.mkDerivation rec { version = "3.3.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1na68860asn8b82ny5ilwbhh4nyl9gvx2yxmm4wr2v1v95v51fky"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libpng nasm ]; meta = { diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 3b030a1eb57..9da9c20942e 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -11,7 +11,7 @@ , hicolor-icon-theme , mypaint-brushes , gdk-pixbuf -, pkgconfig +, pkg-config , python3 , swig , wrapGAppsHook @@ -33,7 +33,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ gettext - pkgconfig + pkg-config swig wrapGAppsHook gobject-introspection # for setup hook diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 73a4d631acb..8a3e41965ff 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchpatch , cmake -, pkgconfig +, pkg-config , qtbase , qttools @@ -32,7 +32,7 @@ mkDerivation rec { ''; nativeBuildInputs = [cmake - pkgconfig]; + pkg-config]; buildInputs = [qtbase qttools diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index b200b9be8cd..f5595da47ad 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { "-DUSE_PYTHON=OFF" "-DUSE_QT=OFF" # GNUInstallDirs - "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkgconfig + "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkg-config ]; meta = with lib; { diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index ad80d3a5404..c8950eba398 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -14,7 +14,7 @@ , mpfr , gmp , glib -, pkgconfig +, pkg-config , harfbuzz , gettext , freetype @@ -38,7 +38,7 @@ mkDerivation rec { sha256 = "1qz384jqgk75zxk7sqd22ma9pyd94kh4h6a207ldx7p9rny6vc5l"; }; - nativeBuildInputs = [ bison flex pkgconfig gettext qmake ]; + nativeBuildInputs = [ bison flex pkg-config gettext qmake ]; buildInputs = [ eigen boost glew opencsg cgal mpfr gmp glib diff --git a/pkgs/applications/graphics/opentoonz/default.nix b/pkgs/applications/graphics/opentoonz/default.nix index d8a6a7c5f95..da5aa7bf6ef 100644 --- a/pkgs/applications/graphics/opentoonz/default.nix +++ b/pkgs/applications/graphics/opentoonz/default.nix @@ -1,5 +1,5 @@ { boost, cmake, fetchFromGitHub, freeglut, freetype, glew, libjpeg, libmypaint -, libpng, libtiff, libusb1, lz4, lzma, lzo, openblas, pkgconfig, qtbase +, libpng, libtiff, libusb1, lz4, lzma, lzo, openblas, pkg-config, qtbase , qtmultimedia, qtscript, lib, stdenv, superlu, wrapQtAppsHook, }: let source = import ./source.nix { inherit fetchFromGitHub; }; in stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ in stdenv.mkDerivation rec { pname = "opentoonz"; version = source.versions.opentoonz; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ boost diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index b44130c47ae..4acb50e200f 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16, - lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }: + lcms2, lensfun, pkg-config, libjpeg, exiv2, liblqr1 }: stdenv.mkDerivation { name = "photivo-2014-01-25"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { sed '1i#include ' -i Sources/filters/ptFilter_StdCurve.cpp ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ]; diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix index 436d6764c75..79a171d6fc3 100644 --- a/pkgs/applications/graphics/photoflow/default.nix +++ b/pkgs/applications/graphics/photoflow/default.nix @@ -20,7 +20,7 @@ , ninja , openexr , pcre -, pkgconfig +, pkg-config , pugixml , lib, stdenv , swig @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { gobject-introspection libxml2 ninja - pkgconfig + pkg-config swig ]; diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 969a3bcb9d1..7948ef0f08c 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , ffmpeg_3, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler }: @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { sha256 = "18nvrqmlifh4m8nfs0d19sb9d1l3a95xc89qxqdr881jcxdsgflw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ffmpeg_3 gtk3 imagemagick libarchive libspectre libwebp poppler ]; prePatch = "patchShebangs ."; diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix index 65ecaa90784..c4fc79c7fec 100644 --- a/pkgs/applications/graphics/qcomicbook/default.nix +++ b/pkgs/applications/graphics/qcomicbook/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, pkg-config, cmake, qtbase, qttools, qtx11extras, poppler }: mkDerivation rec { pname = "qcomicbook"; @@ -12,7 +12,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig + cmake pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index 2b24a34fbc2..886a753ee2c 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -4,7 +4,7 @@ , fetchpatch , cmake -, pkgconfig +, pkg-config , exiv2 , mpv @@ -27,7 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index e0426de6fb6..acd9c576f73 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2, imlib2, file, lcms2, libexif } : +{ lib, stdenv, fetchurl, pkg-config, gtk2, imlib2, file, lcms2, libexif } : stdenv.mkDerivation (rec { version = "2.3.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation (rec { sha256 = "1mc0f2nnas4q0d7zc9r6g4z93i32xlx0p9hl4fn5zkyml24a1q28"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 imlib2 file lcms2 libexif ]; preBuild='' diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 7f9f4167c64..7d1acc1dcd6 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, pixman, libpthreadstubs, gtkmm3, libXau , libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook , lensfun, librsvg }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0d644s4grfia6f3k6y0byd5pwajr12kai2kc280yxi8v3w1b12ik"; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; buildInputs = [ pixman libpthreadstubs gtkmm3 libXau libXdmcp diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index f9e3662f1b8..b985ae7d571 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, mkDerivation +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, mkDerivation , qtbase, qtx11extras, qtsvg, makeWrapper , vulkan-loader, libglvnd, xorg, python3, python3Packages , bison, pcre, automake, autoconf, addOpenGLRunpath @@ -28,7 +28,7 @@ mkDerivation rec { ]; # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2]); # TODO: figure out how to make cmake recognise pyside2 - nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf addOpenGLRunpath ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ]; postUnpack = '' cp -r ${custom_swig} swig diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 31ec8e8ddc7..88d47b58932 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv -, gettext, pkgconfig +, gettext, pkg-config , avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp # List of { src name backend } attibute sets - see installFirmware below: @@ -21,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ gettext - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index 8f5a10268e4..c0945242096 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb-compat-0_1 ? null }: +{ lib, stdenv, fetchurl, sane-backends, libX11, gtk2, pkg-config, libusb-compat-0_1 ? null }: stdenv.mkDerivation rec { pname = "sane-frontends"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ sane-backends libX11 gtk2 ] ++ lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index b9e45a76751..1deaab4dfe5 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng +{ lib, stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkg-config, libpng , libusb-compat-0_1 ? null , gimpSupport ? false, gimp ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { chmod a+rX -R . ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] ++ (if libusb-compat-0_1 != null then [libusb-compat-0_1] else []) ++ lib.optional gimpSupport gimp; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 347d66df987..103a6ec3b6b 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -11,7 +11,7 @@ , vala , sqlite , webkitgtk -, pkgconfig +, pkg-config , gnome3 , gst_all_1 , libgudev @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config itstool gettext desktop-file-utils diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 26b544cf1c5..98348129d9b 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype +{ lib, stdenv, fetchgit, cmake, pkg-config, zlib, libpng, cairo, freetype , json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre , wrapGAppsHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig cmake wrapGAppsHook + pkg-config cmake wrapGAppsHook ]; buildInputs = [ zlib libpng cairo freetype diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 14f502434b2..3f29d25fbe0 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 -, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig +, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkg-config , imagemagick, intltool, autoreconfHook, which, gnome3 }: @@ -39,7 +39,7 @@ let "--with-boost-libdir=${boost.out}/lib" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook gettext ]; + nativeBuildInputs = [ pkg-config autoreconfHook gettext ]; buildInputs = [ ETL boost cairo glibmm mlt-qt5 libsigcxx libxmlxx pango ]; @@ -103,7 +103,7 @@ stdenv.mkDerivation { preConfigure = "./bootstrap.sh"; - nativeBuildInputs = [ pkgconfig autoreconfHook gettext ]; + nativeBuildInputs = [ pkg-config autoreconfHook gettext ]; buildInputs = [ ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index 66ff8675a31..7b9669bc465 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , leptonica, libpng, libtiff, icu, pango, opencl-headers }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; LIBLEPT_HEADERSDIR = "${leptonica}/include"; diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index 18d865ae81c..49cf93835b1 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config , leptonica, libpng, libtiff, icu, pango, opencl-headers }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoreconfHook autoconf-archive ]; + nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ]; buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; meta = { diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index 9718dee45dd..fc39306b753 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, desktop-file-utils, gtk2, libpng, exiv2, lcms +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, desktop-file-utils, gtk2, libpng, exiv2, lcms , intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config desktop-file-utils intltool gettext diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 41af11ef338..7d9ab53bef8 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -2,7 +2,7 @@ , ghostscript, atk, gtk2, glib, fontconfig, freetype , libgnomecanvas, libgnomeprint, libgnomeprintui , pango, libX11, xorgproto, zlib, poppler -, autoconf, automake, libtool, pkgconfig}: +, autoconf, automake, libtool, pkg-config}: let isGdkQuartzBackend = (gtk2.gdktarget == "quartz"); @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libgnomeprint libgnomeprintui ]; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; NIX_LDFLAGS = "-lz" + lib.optionalString (!isGdkQuartzBackend) " -lX11"; diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix index d2c569b91c6..d26f6eccf76 100644 --- a/pkgs/applications/graphics/xzgv/default.nix +++ b/pkgs/applications/graphics/xzgv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }: +{ lib, stdenv, fetchurl, gtk2, libexif, pkg-config, texinfo }: stdenv.mkDerivation rec { pname = "xzgv"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz"; sha256 = "17l1xr9v07ggwga3vn0z1i4lnwjrr20rr8z1kjbw71aaijxl18i5"; }; - nativeBuildInputs = [ pkgconfig texinfo ]; + nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ gtk2 libexif ]; postPatch = '' substituteInPlace config.mk \ diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index 2d253d4462a..5c727dbbaab 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, poppler, pkgconfig, libunarr +{ mkDerivation, lib, fetchFromGitHub, qmake, poppler, pkg-config, libunarr , libGLU, qtdeclarative, qtgraphicaleffects, qtmultimedia, qtquickcontrols , qtscript }: @@ -14,7 +14,7 @@ mkDerivation rec { sha256 = "17kzh69sxpyk4n7c2gkbsvr9y4j14azdy1qxzghsbwp7ij4iw9kv"; }; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ poppler libunarr libGLU qtmultimedia qtscript ]; propagatedBuildInputs = [ qtquickcontrols qtgraphicaleffects qtdeclarative ]; diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index 435f4ccaf6d..a4e5e725490 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, SDL, SDL_image, libjpeg, libpng, libtiff }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, SDL, SDL_image, libjpeg, libpng, libtiff }: stdenv.mkDerivation rec { pname = "zgv"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL SDL_image libjpeg libpng libtiff ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix index 8ea484d4a4c..98c8a8afae0 100644 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchurl, pkgconfig, ncurses, openssl, Security }: +{ lib, stdenv, rustPlatform, fetchurl, pkg-config, ncurses, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "asuka"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0p0x4ch04kydg76bfal5zqzr9hvn5268wf3k2v9h7g8r4y8xqlhw"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 19930714f0c..7442d600085 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -7,7 +7,7 @@ , xdg_utils, yasm, nasm, minizip, libwebp , libusb1, pciutils, nss, re2 -, python2Packages, perl, pkgconfig +, python2Packages, perl, pkg-config , nspr, systemd, kerberos , util-linux, alsaLib , bison, gperf @@ -126,7 +126,7 @@ let nativeBuildInputs = [ llvmPackages.lldClang.bintools - ninja which python2Packages.python perl pkgconfig + ninja which python2Packages.python perl pkg-config python2Packages.ply python2Packages.jinja2 nodejs gnutar python2Packages.setuptools ]; diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 6e4c7d1dade..12adbc0a9b7 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib -, brotli, zstd, lzma, openssl, autoreconfHook, gettext, pkgconfig, libev +, brotli, zstd, lzma, openssl, autoreconfHook, gettext, pkg-config, libev , gpm, libidn, tre, expat , # Incompatible licenses, LGPLv3 - GPLv2 enableGuile ? false, guile ? null @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ++ lib.optional enablePerl perl ; - nativeBuildInputs = [ autoreconfHook gettext pkgconfig ]; + nativeBuildInputs = [ autoreconfHook gettext pkg-config ]; configureFlags = [ "--enable-finger" diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 53a32e09f87..6b3b6351230 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, meson, ninja, pkgconfig, nix-update-script +{ lib, stdenv, fetchgit, meson, ninja, pkg-config, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils , gobject-introspection, wrapGAppsHook, gnome3 }: @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index cff93e196a6..338ceaa4344 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -11,7 +11,7 @@ , meson , ninja , pantheon -, pkgconfig +, pkg-config , python3 , webkitgtk , wrapGAppsHook @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index c1d40fa770f..f39ae2f1669 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch -, cmake, extra-cmake-modules, pkgconfig, qmake +, cmake, extra-cmake-modules, pkg-config, qmake , libpthreadstubs, libxcb, libXdmcp , qtsvg, qttools, qtwebengine, qtx11extras , qtwayland, wrapQtAppsHook @@ -41,7 +41,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules - pkgconfig + pkg-config qmake qttools wrapQtAppsHook diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index db9f46c63ef..ec57bcfae18 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, gpm, openssl, pkgconfig, libev # Misc. +, gpm, openssl, pkg-config, libev # Misc. , libpng, libjpeg, libtiff, librsvg # graphic formats , bzip2, zlib, xz # Transfer encodings , enableFB ? true @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ++ optionals enableX11 [ libX11 libXau libXt ] ++ optional enableDirectFB [ directfb ]; - nativeBuildInputs = [ pkgconfig bzip2 ]; + nativeBuildInputs = [ pkg-config bzip2 ]; configureFlags = [ "--with-ssl" ] ++ lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics" diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index ca6d4335785..3362948e98a 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -2,7 +2,7 @@ , fetchurl , cmake , ninja -, pkgconfig +, pkg-config , intltool , vala , wrapGAppsHook @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cmake intltool ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/applications/networking/browsers/netsurf/browser.nix b/pkgs/applications/networking/browsers/netsurf/browser.nix index 00e70431abd..db4940093b3 100644 --- a/pkgs/applications/networking/browsers/netsurf/browser.nix +++ b/pkgs/applications/networking/browsers/netsurf/browser.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, makeWrapper, wrapGAppsHook # Buildtime dependencies. -, check, pkgconfig, xxd +, check, pkg-config, xxd # Runtime dependencies. , curl, expat, libXcursor, libXrandr, libidn, libjpeg, libpng, libwebp, libxml2 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { makeWrapper perl perlPackages.HTMLParser - pkgconfig + pkg-config xxd ] ++ optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook diff --git a/pkgs/applications/networking/browsers/netsurf/libcss.nix b/pkgs/applications/networking/browsers/netsurf/libcss.nix index b09701fc367..be8adaa1568 100644 --- a/pkgs/applications/networking/browsers/netsurf/libcss.nix +++ b/pkgs/applications/networking/browsers/netsurf/libcss.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl +{ lib, stdenv, fetchurl, pkg-config, perl , buildsystem , libparserutils , libwapcaplet @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl libparserutils diff --git a/pkgs/applications/networking/browsers/netsurf/libdom.nix b/pkgs/applications/networking/browsers/netsurf/libdom.nix index 5bb62801437..4c7224f2263 100644 --- a/pkgs/applications/networking/browsers/netsurf/libdom.nix +++ b/pkgs/applications/networking/browsers/netsurf/libdom.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, expat +{ lib, stdenv, fetchurl, pkg-config, expat , buildsystem , libparserutils , libwapcaplet @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ expat libhubbub diff --git a/pkgs/applications/networking/browsers/netsurf/libhubbub.nix b/pkgs/applications/networking/browsers/netsurf/libhubbub.nix index 3a1a29e743c..9fd04904c8e 100644 --- a/pkgs/applications/networking/browsers/netsurf/libhubbub.nix +++ b/pkgs/applications/networking/browsers/netsurf/libhubbub.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl +{ lib, stdenv, fetchurl, pkg-config, perl , buildsystem , libparserutils }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl libparserutils diff --git a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix index f25ccf96354..24790c477d4 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libnsfb.nix b/pkgs/applications/networking/browsers/netsurf/libnsfb.nix index cb3a759acb8..d093df46629 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsfb.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsfb.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , uilib, SDL , buildsystem }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-vkRso+tU35A/LamDEdEH11dM0R9awHE+YZFW1NGeo5o="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index 032d886085f..582bcc84e4f 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libnslog.nix b/pkgs/applications/networking/browsers/netsurf/libnslog.nix index eba4952d7fc..7189f1c591b 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnslog.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnslog.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, bison, flex +{ lib, stdenv, fetchurl, pkg-config, bison, flex , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A="; }; - nativeBuildInputs = [ pkgconfig bison flex ]; + nativeBuildInputs = [ pkg-config bison flex ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libnspsl.nix b/pkgs/applications/networking/browsers/netsurf/libnspsl.nix index bfbd611000c..01e3e401a78 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnspsl.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnspsl.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libnsutils.nix b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix index 56e2e048b67..b0d954a00d4 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsutils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix index 66a2dbcf437..14399788433 100644 --- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix +++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gperf +{ lib, stdenv, fetchurl, pkg-config, gperf , buildsystem , libdom , libhubbub @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-LA3PlS8c2ILD6VQB75RZ8W27U8XT5FEjObL563add4E="; }; - nativeBuildInputs = [ pkgconfig gperf ]; + nativeBuildInputs = [ pkg-config gperf ]; buildInputs = [ libdom libhubbub diff --git a/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix b/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix index 38680da1bcf..c7362b998be 100644 --- a/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix +++ b/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 5ab7cb8d93b..26cbc92adac 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit -, pkgconfig, wrapGAppsHook +, pkg-config, wrapGAppsHook , glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk , xorg, dmenu, findutils, gnused, coreutils , patches ? null @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0pjsv2q8c74sdmqsalym8wa2lv55lj4pd36miam5wd12769xw68m"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ glib gcr glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ]; inherit patches; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 705b9ec7f70..816b986f883 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libsoup, webkitgtk, gtk3, glib-networking +{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk, gtk3, glib-networking , gsettings-desktop-schemas, wrapGAppsHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1qg18z2gnsli9qgrqfhqfrsi6g9mcgr90w8yab28nxrq4aha6brf"; }; - nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; + nativeBuildInputs = [ wrapGAppsHook pkg-config ]; buildInputs = [ gtk3 libsoup webkitgtk glib-networking gsettings-desktop-schemas ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/applications/networking/browsers/webbrowser/default.nix b/pkgs/applications/networking/browsers/webbrowser/default.nix index 9ea122fc7f6..d9e997f514b 100644 --- a/pkgs/applications/networking/browsers/webbrowser/default.nix +++ b/pkgs/applications/networking/browsers/webbrowser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, makeDesktopItem, pkgconfig, makeWrapper +{ stdenv, lib, fetchgit, makeDesktopItem, pkg-config, makeWrapper # Build , python2, autoconf213, yasm, perl , unzip, gnome2, gnum4 @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gnum4 makeWrapper perl pkgconfig python2 + gnum4 makeWrapper perl pkg-config python2 ]; buildInputs = [ diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index 1c315447254..d0db8cc10b9 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -1,5 +1,5 @@ { autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libctemplate, libmaxminddb -, libpcap, libtins, libtool, lzma, openssl, pkgconfig, lib, stdenv, tcpdump, wireshark-cli +, libpcap, libtins, libtool, lzma, openssl, pkg-config, lib, stdenv, tcpdump, wireshark-cli }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; # cbor-diag, cddl and wireshark-cli are only used for tests. - nativeBuildInputs = [ autoconf automake libtool pkgconfig cbor-diag cddl wireshark-cli ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config cbor-diag cddl wireshark-cli ]; buildInputs = [ boost libpcap diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index 5ec94c819a6..57b39383e97 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -1,6 +1,6 @@ { lib, stdenv , substituteAll -, pkgconfig +, pkg-config , fetchurl , python3 , dropbox @@ -35,7 +35,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection gdk-pixbuf # only for build, the install command also wants to use GTK through introspection diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index e14e5b57461..090f53cffb6 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, wrapQtAppsHook }: +{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkg-config, boost, wirelesstools, iw, qwt, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "linssid"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; }; - nativeBuildInputs = [ pkgconfig qmake wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; buildInputs = [ qtbase qtsvg boost qwt ]; patches = [ ./0001-unbundled-qwt.patch ]; diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index 5aa0861b4e9..01528df856c 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnutls, gsasl, libidn, Security }: +{ lib, stdenv, fetchurl, pkg-config, gnutls, gsasl, libidn, Security }: with lib; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1gcxvhin5y0q47svqbf90r5aip0cgywm8sq6m84ygda7km8xylwv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnutls gsasl libidn ] ++ optional stdenv.isDarwin Security; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index fd6a011b1bd..02131b41ea4 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, texinfo +{ stdenv, lib, fetchurl, autoreconfHook, pkg-config, texinfo , netcat-gnu, gnutls, gsasl, libidn2, Security , withKeyring ? true, libsecret ? null , systemd ? null }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin Security ++ lib.optional withKeyring libsecret; - nativeBuildInputs = [ autoreconfHook pkgconfig texinfo ]; + nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; configureFlags = [ "--sysconfdir=/etc" ] ++ lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 368bd716ce6..d93e5fbb963 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, qt5 +{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkg-config, qt5 , avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsaLib, python , rnnoise @@ -25,7 +25,7 @@ let patches = (source.patches or []) ++ [ ./fix-rnnoise-argument.patch ]; - nativeBuildInputs = [ pkgconfig python qt5.qmake ] + nativeBuildInputs = [ pkg-config python qt5.qmake ] ++ (overrides.nativeBuildInputs or [ ]); buildInputs = [ boost protobuf avahi ] diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 5e53e61e040..90bbd31a888 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,5 +1,5 @@ { spellChecking ? true -, lib, stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null +, lib, stdenv, fetchurl, pkg-config, gtk3, gtkspell3 ? null , gmime2, gettext, intltool, itstool, libxml2, libnotify, gnutls , makeWrapper, gnupg , gnomeSupport ? true, libsecret, gcr @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "17agd27sn4a7nahvkpg0w39kv74njgdrrygs74bbvpaj8rk2hb55"; }; - nativeBuildInputs = [ pkgconfig gettext intltool itstool libxml2 makeWrapper ]; + nativeBuildInputs = [ pkg-config gettext intltool itstool libxml2 makeWrapper ]; buildInputs = [ gtk3 gmime2 libnotify gnutls ] ++ lib.optional spellChecking gtkspell3 ++ lib.optionals gnomeSupport [ libsecret gcr ]; diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix index d85266f68d6..528db85092c 100644 --- a/pkgs/applications/networking/nym/default.nix +++ b/pkgs/applications/networking/nym/default.nix @@ -1,7 +1,7 @@ { lib , rustPlatform , fetchFromGitHub -, pkgconfig +, pkg-config , openssl , libredirect , writeText @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0zr5nzmglmvn6xfqgvipbzy8nw5cl3nf7zjmghkqdwi6zj9p9272"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index c1711497f78..452acc1c7ca 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtkeychain, sqlite, libsecret }: +{ lib, stdenv, fetchurl, mkDerivation, cmake, pkg-config, qtbase, qtkeychain, sqlite, libsecret }: mkDerivation rec { pname = "owncloud-client"; @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "1xcklhvbyg34clm9as2rjnjfwxpwq77lmdxj6qc0w7q43viqvlz3"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ qtbase qtkeychain sqlite ]; qtWrapperArgs = [ diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 8ca82c5b98f..c7a05f37ca8 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, qt4, boost, bzip2, libX11 +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qt4, boost, bzip2, libX11 , fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ] ++ lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 20fb5d4e79c..b4efd89441e 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor , libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring -, makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib +, makeWrapper, ncurses, pkg-config, libxml2, sqlite, zlib , libpulseaudio, libopus, libogg, jansson, libsodium }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig libtool makeWrapper ]; + nativeBuildInputs = [ pkg-config libtool makeWrapper ]; buildInputs = [ adns curl gmp gnutls libextractor libgcrypt libgnurl libidn libmicrohttpd libunistring libxml2 ncurses gettext libsodium diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index e479da0f22a..dd7f4a7bb60 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }: +{ lib, stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkg-config, glib, gnutls }: stdenv.mkDerivation rec { pname = "ncdc"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1bdgqd07f026qk6vpbxqsin536znd33931m3b4z44prlm9wd6pyi"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls ]; meta = with lib; { diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index d83cc6ad184..ace528494bc 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkg-config , boost, libtorrent-rasterbar, qtbase, qttools, qtsvg , debugSupport ? false , guiSupport ? true, dbus ? null # GUI (disable to run headless) @@ -22,7 +22,7 @@ mkDerivation rec { }; # NOTE: 2018-05-31: CMake is working but it is not officially supported - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ] ++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 412016e4877..85a5217ff69 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkg-config, protobuf, bzip2 , libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg_3 , qtmultimedia, qtx11extras, qttools }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { libretroshare/src/upnp/UPnPBase.cpp ''; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg_3 diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index 4eeac2db981..761d18e5fe3 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, CoreServices, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, CoreServices, Security }: rustPlatform.buildRustPackage rec { pname = "synapse-bt"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0lhhdzq4sadnp2pnbq309d1mb7ggbf24k5ivlchrjhllbim1wmdz"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix index ef2b97563bb..cbeb6afa408 100644 --- a/pkgs/applications/networking/p2p/torrential/default.nix +++ b/pkgs/applications/networking/p2p/torrential/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , cmake -, pkgconfig +, pkg-config , vala_0_40 , pantheon , curl @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake vala_0_40 # https://github.com/davidmhewitt/torrential/issues/135 - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index 4dbb54faabc..809e4528df9 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, makeDesktopItem, unzip, fpc, lazarus, +{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, unzip, fpc, lazarus, libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1dyx778756zhvz5sxgdvy49p2c0x44w4nmcfd90wqrmgfknncnf5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ unzip fpc lazarus stdenv.cc libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index fe93657048a..c89e5397706 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig +{ lib, stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkg-config , intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib, fetchpatch }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs= [ autoconf automake libtool wrapGAppsHook - pkgconfig intltool autoconf-archive + pkg-config intltool autoconf-archive appstream-glib ]; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index ab4fc0908ba..8cc674b1ea7 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -2,7 +2,7 @@ , lib , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , openssl , curl , libevent @@ -50,7 +50,7 @@ in stdenv.mkDerivation { ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake ] ++ lib.optionals enableGTK3 [ wrapGAppsHook ] diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index dfc63fff7e4..1d05cafef83 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkgconfig, python2 +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, python2 , boost, db, openssl, geoip, libiconv, miniupnpc , srcOnly, fetchgit }: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { "--with-boost-libdir=${boostPython.out}/lib" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool python2 boostPython db openssl geoip miniupnpc libiconv diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index a81356da252..04f2efd5b07 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg, glib, openssl +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, alsaLib, ffmpeg, glib, openssl , pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama , libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland , gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt, cairo @@ -82,7 +82,7 @@ in stdenv.mkDerivation rec { zlib ] ++ optional stdenv.isLinux systemd; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; doCheck = true; diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 61e82726f35..e7544258acf 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoconf, automake, pkgconfig, libtool +{ stdenv, lib, fetchurl, autoconf, automake, pkg-config, libtool , gtk2, halibut, ncurses, perl, darwin }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { done '' else null; - nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ]; + nativeBuildInputs = [ autoconf automake halibut libtool perl pkg-config ]; buildInputs = lib.optionals stdenv.hostPlatform.isUnix [ gtk2 ncurses ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp; diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index cdbdde31fac..acf1d7cc2d2 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkgconfig, autoreconfHook +{lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkg-config, autoreconfHook , enableCredssp ? (!stdenv.isDarwin) } : @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { sha256 = "1s6k1jwd28y38ymk3lfv76ch4arpfwrbdhpkbnwwy3fc4617gb78"; }; - nativeBuildInputs = [pkgconfig autoreconfHook]; + nativeBuildInputs = [pkg-config autoreconfHook]; buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls] ++ lib.optional enableCredssp krb5; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 35ce055b3b0..02f1e7ed344 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook , glib, gtk3, gettext, libxkbfile, libX11 , freerdp, libssh, libgcrypt, gnutls , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-n3YfLKCv6CoBeUIv+1yN6RIih63PTFj5zr+dZDJwYdw="; }; - nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; buildInputs = [ gsettings-desktop-schemas glib gtk3 gettext libxkbfile libX11 diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 6401393acda..dc828b58825 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh -, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }: +, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }: mkDerivation { pname = "x2goclient"; @@ -12,7 +12,7 @@ mkDerivation { }; buildInputs = [ cups libssh libXpm nx-libs openldap openssh - qtbase qtsvg qtx11extras qttools phonon pkgconfig ]; + qtbase qtsvg qtx11extras qttools phonon pkg-config ]; postPatch = '' substituteInPlace Makefile \ diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index faa65379de4..b8677a2683c 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: +{ lib, stdenv, fetchFromGitHub, pkg-config, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: let xorgxrdp = stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ let sha256 = "1bhp5x47hajhinvglmc4vxxnpjvfjm6369njb3ghqfr7c5xypvzr"; }; - nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; + nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; buildInputs = [ xorg.xorgserver ]; @@ -45,7 +45,7 @@ let sha256 = "0ynj6pml4f38y8571ryhifza57wfqg4frdrjcwzw3fmryiznfm1z"; }; - nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; + nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; buildInputs = [ openssl systemd pam fuse libjpeg libopus xorg.libX11 xorg.libXfixes xorg.libXrandr ]; diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index 000a2fa0a4a..1e3f2635f47 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libtool, gtk3, libpcap, goocanvas2, +{ lib, stdenv, fetchurl, pkg-config, libtool, gtk3, libpcap, goocanvas2, popt, itstool, libxml2 }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0w63vg2q6if3wvy2md66in8b6cdw9q40hny5xy6yrxky58l4kmg7"; }; - nativeBuildInputs = [ itstool pkgconfig (lib.getBin libxml2) ]; + nativeBuildInputs = [ itstool pkg-config (lib.getBin libxml2) ]; buildInputs = [ libtool gtk3 libpcap goocanvas2 popt ]; diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index d3bfc148c42..a3c79fd9560 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre , openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip, harfbuzz -, pkgconfig }: +, pkg-config }: stdenv.mkDerivation rec { pname = "ettercap"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; strictDeps = true; - nativeBuildInputs = [ cmake flex bison pkgconfig ]; + nativeBuildInputs = [ cmake flex bison pkg-config ]; buildInputs = [ libpcap libnet zlib curl pcre openssl ncurses glib gtk3 atk pango geoip harfbuzz diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 4c31d374676..ad1ee0a0b30 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libpcap, pcre, libnl, zlib, libmicrohttpd +{ lib, stdenv, fetchurl, pkg-config, libpcap, pcre, libnl, zlib, libmicrohttpd , sqlite, protobuf, protobufc, libusb1, libcap, binutils, elfutils , withNetworkManager ? false, glib, networkmanager , withPython ? false, python3 @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1n6y6sgqf50bng8n0mhs2r1w0ak14mv654sqay72a78wh2s7ywzg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap pcre libmicrohttpd libnl zlib sqlite protobuf protobufc diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index bd1757dfb48..55789401c14 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares +{ lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib , libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper , withQt ? true, qt5 ? null @@ -34,7 +34,7 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; nativeBuildInputs = [ - bison cmake flex pkgconfig + bison cmake flex pkg-config ] ++ optional withQt qt5.wrapQtAppsHook; buildInputs = [ diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix index f3eae72970f..6652e7c986c 100644 --- a/pkgs/applications/networking/sniproxy/default.nix +++ b/pkgs/applications/networking/sniproxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkg-config, udns }: stdenv.mkDerivation rec { pname = "sniproxy"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0isgl2lyq8vz5kkxpgyh1sgjlb6sqqybakr64w2mfh29k5ls8xzm"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gettext libev pcre udns ]; meta = with lib; { diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index 35e89c0d0a0..0e82aa2dd85 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, python3, sphinx +, meson, ninja, pkg-config, python3, sphinx , acl, curl, fuse, libselinux, udev, xz, zstd , fuseSupport ? true , selinuxSupport ? true @@ -22,7 +22,7 @@ stdenv.mkDerivation { ++ lib.optionals (fuseSupport) [ fuse ] ++ lib.optionals (selinuxSupport) [ libselinux ] ++ lib.optionals (udevSupport) [ udev ]; - nativeBuildInputs = [ meson ninja pkgconfig python3 sphinx ]; + nativeBuildInputs = [ meson ninja pkg-config python3 sphinx ]; checkInputs = [ glibcLocales rsync ]; postPatch = '' diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 06371f80ffe..2723f15dd65 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkgconfig, rsync, +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkg-config, rsync, asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ rsync - cmake lua pkgconfig + cmake lua pkg-config asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt ]; diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index a6175af3511..ec983276de8 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, ldc, installShellFiles, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoreconfHook, ldc, installShellFiles, pkg-config , curl, sqlite, libnotify , withSystemd ? stdenv.isLinux, systemd ? null }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "12g2z6c4f65y8cc7vyhk9nlg1mpbsmlsj7ghlny452qhr13m7qpn"; }; - nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkgconfig ]; + nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; buildInputs = [ curl sqlite libnotify diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 1db69432642..60b24a6619c 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gd, ncurses, sqlite, check }: +{ lib, stdenv, fetchurl, pkg-config, gd, ncurses, sqlite, check }: stdenv.mkDerivation rec { pname = "vnstat"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { substituteInPlace src/cfg.c --replace /usr/local $out ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gd ncurses sqlite ]; checkInputs = [ check ]; diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 3393dea929e..3de0d450de5 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3 +{ lib, stdenv, fetchFromGitLab, vala, python3, pkg-config, meson, ninja, gtk3 , json-glib, libsoup, webkitgtk, geocode-glib, nix-update-script , libappindicator, desktop-file-utils, appstream, wrapGAppsHook }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index b8e850211cd..557c2865fa1 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, pkgconfig +{ lib, stdenv, fetchurl, openssl, pkg-config , withPerl ? false, perl , withPython ? false, python3 , withTcl ? false, tcl @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "03fyi0j44zcanj1rsdx93hkdskwfvhbywjiwd17f9q1a7yp8l8zz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ optional withPerl perl diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index cbdd29b418d..24eace7eb99 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu -, lua, libGLU, libGL, pkgconfig, perl, autoreconfHook +, lua, libGLU, libGL, pkg-config, perl, autoreconfHook }: let @@ -43,7 +43,7 @@ stdenv.mkDerivation { sha256 = "1i1lvhbgllsh2z8i6jj4mvrjak4a7r69psvk7syw03s4p7670mfk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU libGL lua perl autoreconfHook ]; diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 2174d38d8b4..b716b0f2f90 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2-x11 , pkgconfig , python3 , gfortran , lesstif +{ lib, stdenv, fetchurl, gtk2-x11 , pkg-config , python3 , gfortran , lesstif , cfitsio , getopt , perl , groff , which, darwin, ncurses }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "9faa0b3e674b5ffe5b1aee88027d7401a46ae28cd0b306595300547605d6222a"; }; - nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ]; + nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index a089bf6534b..4cda15e516d 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool +{ lib, stdenv, fetchurl, pkg-config, intltool , gtk3, glib, curl, goocanvas2, gpsd , hamlib, wrapGAppsHook }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation { sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7"; }; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; meta = with lib; { diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index 305eb158d13..82331a9496d 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, fetchpatch, pkgconfig, freetype, pango, libpng, libtiff +{lib, stdenv, fetchurl, fetchpatch, pkg-config, freetype, pango, libpng, libtiff , giflib, libjpeg, netpbm}: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1rzc1alph03j67lrr66499zl0wqndiipmj99nqgvh9xzm1qdb023"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype pango libpng libtiff giflib libjpeg netpbm ]; patches = [ diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix index 17d8944128e..a2ba038c059 100644 --- a/pkgs/applications/science/biology/EZminc/default.nix +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk4, fftwFloat, gsl }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libminc, bicpl, itk4, fftwFloat, gsl }: stdenv.mkDerivation rec { pname = "EZminc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0wy8cppf5xpgfqvgb3mqs1cjh81n6qzkk6zxv29wvng8nar9wsy4"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ itk4 libminc bicpl fftwFloat gsl ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" diff --git a/pkgs/applications/science/biology/exonerate/default.nix b/pkgs/applications/science/biology/exonerate/default.nix index 9f87d0117df..f7b6bf6c14c 100644 --- a/pkgs/applications/science/biology/exonerate/default.nix +++ b/pkgs/applications/science/biology/exonerate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, pkgconfig }: +{ lib, stdenv, fetchurl, glib, pkg-config }: stdenv.mkDerivation rec { version = "2.4.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "Generic tool for sequence alignment"; diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 3dbc39684c2..154965b1521 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , automake , autoconf , libtool @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "neuron"; version = "7.5"; - nativeBuildInputs = [ which pkgconfig automake autoconf libtool ]; + nativeBuildInputs = [ which pkg-config automake autoconf libtool ]; buildInputs = [ ncurses readline python mpi iv ]; src = fetchurl { diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index 01c65f4bcff..2efa39ac489 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, rocksdb, rapidjson, pkgconfig, fetchFromGitHub, fetchpatch, zlib }: +{ lib, stdenv, cmake, rocksdb, rapidjson, pkg-config, fetchFromGitHub, fetchpatch, zlib }: stdenv.mkDerivation rec { pname = "sortmerna"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0r91viylzr069jm7kpcgb45kagvf8sqcj5zc1af4arl9sgfs1f3j"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib rocksdb rapidjson ]; cmakeFlags = [ diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index 61b2ea143b8..9f88079627e 100755 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib, autoreconfHook, pkgconfig, perl }: +{ lib, stdenv, fetchFromGitHub, zlib, autoreconfHook, pkg-config, perl }: stdenv.mkDerivation rec { pname = "vcftools"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx"; }; - buildInputs = [ autoreconfHook pkgconfig zlib perl ]; + buildInputs = [ autoreconfHook pkg-config zlib perl ]; meta = with lib; { description = "A set of tools written in Perl and C++ for working with VCF files, such as those generated by the 1000 Genomes Project"; diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index a1e775135e0..f5c6d79e28a 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU, libGL, libX11, doxygen }: +{ lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkg-config, libGLU, libGL, libX11, doxygen }: stdenv.mkDerivation rec { name = "avogadro-1.1.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 eigen zlib openbabel libGL libGLU libX11 ]; - nativeBuildInputs = [ cmake pkgconfig doxygen ]; + nativeBuildInputs = [ cmake pkg-config doxygen ]; NIX_CFLAGS_COMPILE = "-include ${libGLU.dev}/include/GL/glu.h"; diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index 8c5e9e41aac..ab16866fe01 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, pkgconfig, cmake +{ lib, mkDerivation, fetchFromGitHub, pkg-config, cmake , libzip, boost, fftw, qtbase, libusb1, libsigrok4dsl , libsigrokdecode4dsl, python3, fetchpatch }: @@ -27,7 +27,7 @@ mkDerivation rec { ./qt515.patch ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix index a2fcb9a929d..8e04d72780c 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, autoreconfHook, +{ lib, stdenv, pkg-config, autoreconfHook, glib, libzip, libserialport, check, libusb1, libftdi, systemd, alsaLib, dsview }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { export sourceRoot=$sourceRoot/libsigrok4DSL ''; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib libzip libserialport libusb1 libftdi systemd check alsaLib diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix index 2bab4b681d3..09eed4a67c5 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, autoreconfHook, +{ lib, stdenv, pkg-config, autoreconfHook, glib, check, python3, dsview }: @@ -11,7 +11,7 @@ stdenv.mkDerivation { export sourceRoot=$sourceRoot/libsigrokdecode4DSL ''; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ python3 glib check diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index 9ef47ae2634..f1c458f40d9 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit , flex, bison, fig2dev, imagemagick, netpbm, gtk2 -, pkgconfig +, pkg-config }: with lib; @@ -24,7 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ flex bison - pkgconfig + pkg-config imagemagick fig2dev netpbm diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 91d6f5e77ab..b25f76800e8 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchpatch, fetchFromGitHub, qmake, pkgconfig +{ mkDerivation, lib, stdenv, fetchpatch, fetchFromGitHub, qmake, pkg-config , qtbase, qtsvg, qttools, qtserialport, boost, libgit2 }: @@ -32,7 +32,7 @@ mkDerivation rec { buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ]; - nativeBuildInputs = [ qmake pkgconfig qttools ]; + nativeBuildInputs = [ qmake pkg-config qttools ]; patches = [(fetchpatch { name = "fix-libgit2-version.patch"; diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index c9a3dcf1aa0..053211f52ad 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }: +{ lib, stdenv, fetchurl, pkg-config, guile, gtk2, flex, gawk, perl }: stdenv.mkDerivation { pname = "geda"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { configureFlags = [ "--disable-update-xdg-database" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ guile gtk2 flex gawk perl ]; meta = with lib; { diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index a44a892eabe..94a8f081f69 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: +{ lib, stdenv, fetchgit, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: stdenv.mkDerivation { pname = "gerbv"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gettext libtool automake autoconf cairo gtk2 ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index aeca4326756..971891a5b01 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, gtk3, gperf, pkgconfig, bzip2, tcl, tk, wrapGAppsHook, judy, xz }: +{ lib, stdenv, fetchurl, glib, gtk3, gperf, pkg-config, bzip2, tcl, tk, wrapGAppsHook, judy, xz }: stdenv.mkDerivation rec { pname = "gtkwave"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ma30jyc94iid3v3m8aw4i2lyiqfxkpsdvdmmaibynk400cbzivl"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ glib gtk3 gperf bzip2 tcl tk judy xz ]; configureFlags = [ diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index c16f6bf122b..2c5ee674a23 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, python3Packages +{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook , fmt, graphviz, llvmPackages ? null }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { shopt -u extglob ''; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook ] ++ (with python3Packages; [ python pybind11 ]) ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index 6b9f07ee68f..8e4241b3ea9 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -13,7 +13,7 @@ , libuuid , libzip , opencascade -, pkgconfig +, pkg-config , podofo , python3 , sqlite @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ boost.dev - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/science/electronics/hyp2mat/default.nix b/pkgs/applications/science/electronics/hyp2mat/default.nix index 01d587fc172..799af4c4308 100644 --- a/pkgs/applications/science/electronics/hyp2mat/default.nix +++ b/pkgs/applications/science/electronics/hyp2mat/default.nix @@ -7,7 +7,7 @@ , groff , libharu , autoreconfHook -, pkgconfig +, pkg-config , libpng , zlib }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index c2da57d1833..3ed6234b4f8 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -13,7 +13,7 @@ , curl , openssl , boost -, pkgconfig +, pkg-config , doxygen , pcre , libpthreadstubs @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { ] ; - nativeBuildInputs = [ cmake doxygen pkgconfig lndir ]; + nativeBuildInputs = [ cmake doxygen pkg-config lndir ]; buildInputs = [ libGLU diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 47de2173947..69ff7b2e69f 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , gtk2 , bison , intltool @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config bison intltool flex diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index f43717389b5..00c830fcd33 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkgconfig, cmake, glib, boost, libsigrok +{ mkDerivation, lib, fetchurl, pkg-config, cmake, glib, boost, libsigrok , libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm , pcre, librevisa, python3, qtbase, qtsvg }: @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib boost libsigrok libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix index 013f5a098bc..68322a19178 100644 --- a/pkgs/applications/science/electronics/xcircuit/default.nix +++ b/pkgs/applications/science/electronics/xcircuit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, automake, pkgconfig +{ lib, stdenv, fetchurl, autoreconfHook, automake, pkg-config , cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }: let @@ -14,7 +14,7 @@ in stdenv.mkDerivation { sha256 = "1h1ywc3mr7plvwnhdii2zgnnv5ih2nhyl4qbdjpi83dq0aq1s2mn"; }; - nativeBuildInputs = [ autoreconfHook automake pkgconfig ]; + nativeBuildInputs = [ autoreconfHook automake pkg-config ]; hardeningDisable = [ "format" ]; configureFlags = [ diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index 26fbadc6159..5052a3715ef 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, gtk2, pkgconfig}: +{lib, stdenv, fetchurl, gtk2, pkg-config}: stdenv.mkDerivation rec { name = "xoscope-2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "00xlvvqyw6l1ljbsx1vgx2v1jfh0xacz1a0yhq1dj6yxf5wh58x8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; # from: https://aur.archlinux.org/packages.php?ID=12140&detail=1 diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index a147cb305cc..59d7315ef41 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libglade, gtk2, guile, libxml2, perl -, intltool, libtool, pkgconfig }: +, intltool, libtool, pkg-config }: stdenv.mkDerivation rec { pname = "drgeo"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./struct.patch ]; buildInputs = [libglade gtk2 guile libxml2 - perl intltool libtool pkgconfig]; + perl intltool libtool pkg-config]; prebuild = '' cp drgeo.desktop.in drgeo.desktop diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 54842dd4769..a2ff8382947 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -5,7 +5,7 @@ # - The exact version can be specified through the `version` argument to # the derivation; it defaults to the latest stable version. -{ lib, stdenv, fetchzip, writeText, pkgconfig, gnumake42 +{ lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses , buildIde ? !(stdenv.isDarwin && lib.versionAtLeast version "8.10") @@ -121,7 +121,7 @@ self = stdenv.mkDerivation { ''; }; - nativeBuildInputs = [ pkgconfig ] ++ optional (!versionAtLeast "8.6") gnumake42; + nativeBuildInputs = [ pkg-config ] ++ optional (!versionAtLeast "8.6") gnumake42; buildInputs = [ ncurses ] ++ ocamlBuildInputs ++ optionals buildIde (if versionAtLeast "8.10" diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index fd31a5732e3..b0b3e5e610e 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, cln, gmp, git, swig, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, cln, gmp, git, swig, pkg-config , readline, libantlr3c, boost, jdk, python3, antlr3_4 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1rhs4pvzaa1wk00czrczp58b2cxfghpsnq534m0l3snnya2958jp"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ gmp git python3.pkgs.toml cln readline swig libantlr3c antlr3_4 boost jdk python3 ]; configureFlags = [ "--enable-language-bindings=c,c++,java" diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index d094019dbe9..bb10998b2f4 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: +{ lib, pkg-config, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "elan"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-2fYicpoEERwD4OjdpseKQOkDvZlb7NnOZcb6Tu+rQdA="; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl zlib openssl ]; diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 3542dab9382..8752c4ef59d 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, ocaml, opaline }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ocaml, opaline }: stdenv.mkDerivation rec { pname = "ott"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0l81126i2qkz11fs5yrjdgymnqgjcs5avb7f951h61yh1s68jpnn"; }; - nativeBuildInputs = [ pkgconfig opaline ]; + nativeBuildInputs = [ pkg-config opaline ]; buildInputs = [ ocaml ]; installTargets = "ott.install"; diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index 4db3c333e97..2606b94f4bb 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, ncurses, ocamlPackages }: +{ lib, stdenv, fetchurl, pkg-config, ncurses, ocamlPackages }: stdenv.mkDerivation rec { pname = "prooftree"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0z1z4wqbqwgppkh2bm89fgy07a0y2m6g4lvcyzs09sm1ysklk2dh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] ++ (with ocamlPackages; [ ocaml findlib camlp5 lablgtk ]); diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index 73fe423673b..67779b2b572 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, smlnj, rsync }: +{ lib, stdenv, fetchurl, pkg-config, smlnj, rsync }: stdenv.mkDerivation rec { pname = "twelf"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0fi1kbs9hrdrm1x4k13angpjasxlyd1gc3ys8ah54i75qbcd9c4i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ smlnj rsync ]; buildPhase = '' diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index d9fbc626e00..7cbff99bf47 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre2, perl, readline, tcl, texLive, tk, xz, zlib -, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, blas, lapack +, less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack , curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch , withRecommendedPackages ? true , enableStrictBarrier ? false @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu - pkgconfig bison imake which blas lapack curl tcl tk jdk + pkg-config bison imake which blas lapack curl tcl tk jdk ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ diff --git a/pkgs/applications/science/math/cemu/default.nix b/pkgs/applications/science/math/cemu/default.nix index 65dd05d3d62..cc8c3514a0b 100644 --- a/pkgs/applications/science/math/cemu/default.nix +++ b/pkgs/applications/science/math/cemu/default.nix @@ -9,7 +9,7 @@ , qmake , git , libpng_apng -, pkgconfig +, pkg-config }: mkDerivation rec { @@ -26,7 +26,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake git - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index c55e8d9adff..4bb9b0ae681 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }: +{ lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python }: stdenv.mkDerivation rec { name = "ginac-1.8.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline ] ++ lib.optional stdenv.isDarwin gmp; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ pkg-config python ]; preConfigure = "patchShebangs ginsh"; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 37173f81978..931e83defdc 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , fetchpatch , python3 , meson @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { intltool # for libqalculate meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index 9d76ef75d26..6e9ff90315c 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl -, pkgconfig, gtksourceview, pango, gettext, dconf +, pkg-config, gtksourceview, pango, gettext, dconf , makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme , texinfo, ssw, python3 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0lqrash677b09zxdlxp89z6k02y4i23mbqg83956dwl69wc53dan"; }; - nativeBuildInputs = [ pkgconfig texinfo python3 ]; + nativeBuildInputs = [ pkg-config texinfo python3 ]; buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl gtksourceview pango gettext makeWrapper gsettings-desktop-schemas hicolor-icon-theme ssw diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index d49285c3e2f..00d35b491d6 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , fetchurl , autoreconfHook -, pkgconfig +, pkg-config , flint , gmp , python3 @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; patches = [ diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index d7d880df040..3d80d8c039e 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "qalculate-gtk"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ intltool pkgconfig autoreconfHook wrapGAppsHook ]; + nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook ]; buildInputs = [ libqalculate gtk3 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix index e7cf98c7266..9e0c8403646 100644 --- a/pkgs/applications/science/math/rofi-calc/default.nix +++ b/pkgs/applications/science/math/rofi-calc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , rofi-unwrapped , libqalculate , glib @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 416f2b957b7..8ef1f5189e5 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -17,7 +17,7 @@ let inherit sage-src env-locations pynac singular; ecl = maxima-ecl.ecl; linbox = pkgs.linbox.override { withSage = true; }; - pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig + pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; }; }; @@ -56,7 +56,7 @@ let inherit env-locations; inherit python3 singular palp flint pynac pythonEnv maxima-ecl; ecl = maxima-ecl.ecl; - pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig + pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; # The documentation for sage, building it takes a lot of ram. @@ -70,7 +70,7 @@ let inherit python3 pythonEnv; inherit sage-env; inherit pynac singular maxima-ecl; - pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig + pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config three = nodePackages.three; }; diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 8c5eac2c06d..fad05099a73 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkgconfig +{ stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkg-config , lib , fetchpatch , autoreconfHook @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison perl - pkgconfig + pkg-config autoreconfHook ]; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index e549fda1162..460ea1408ec 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, autoconf, automake, pkgconfig, m4, curl, +{ fetchFromGitHub, lib, stdenv, autoconf, automake, pkg-config, m4, curl, libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0nicpkag18xq0libfqqvs0im22mijpsxzfk272iwdd9l0lmgfvyd"; }; - nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ]; + nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; buildInputs = [ curl libGLU libGL libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index a18131993e5..cab0fa5ff5c 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -1,6 +1,6 @@ {lib, stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, hwloc, jre, lapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which, -lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, +lp_solve, omniorb, sqlite, libatomic_ops, pkg-config, file, gettext, flex, bison, doxygen, boost, openscenegraph, gnome2, xorg, git, bash, gtk2, makeWrapper }: let @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [autoconf cmake automake libtool gfortran clang gnumake hwloc jre lapack blas hdf5 expat ncurses readline qt4 webkitgtk which - lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison + lp_solve omniorb sqlite libatomic_ops pkg-config file gettext flex bison doxygen boost openscenegraph gnome2.gtkglext xorg.libXmu git gtk2 makeWrapper]; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index bf21983adcd..2e34f2d15d2 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake , libjpeg ? null , zlib ? null , libpng ? null @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg zlib libpng eigen libtiff ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index ec22aaa599b..731230130ca 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake , eigen, opencv, ceres-solver, cgal, boost, vcg , gmp, mpfr, glog, gflags, libjpeg_turbo }: @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog gflags libjpeg_turbo ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; preConfigure = '' cmakeFlagsArray=( diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 425d3e1e4b9..2f3d57c31e7 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, llvm_5 , libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre -, pkgconfig, python, xxHash, zlib, zstd +, pkg-config, python, xxHash, zlib, zstd , libAfterImage, giflib, libjpeg, libtiff, libpng , Cocoa, OpenGL, noSplash ? false }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0mqvj42nax0bmz8h83jjlwjm3xxjy1n0n10inc8csip9ly28fs64"; }; - nativeBuildInputs = [ makeWrapper cmake pkgconfig ]; + nativeBuildInputs = [ makeWrapper cmake pkg-config ]; buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 lzma gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 023a4fc8b6a..95c8aebd32d 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,7 +1,7 @@ { lib, mkDerivation, fetchFromGitHub, SDL2 , qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2 , qtgraphicaleffects, qtspeech, qtx11extras, qmake, qttools -, gst_all_1, wayland, pkgconfig +, gst_all_1, wayland, pkg-config }: mkDerivation rec { @@ -19,7 +19,7 @@ mkDerivation rec { enableParallelBuilding = true; buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs; - nativeBuildInputs = [ pkgconfig qmake qttools ]; + nativeBuildInputs = [ pkg-config qmake qttools ]; preConfigure = '' mkdir build diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 13a67c6236f..6049b0e45e6 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -8,7 +8,7 @@ , installShellFiles , makeWrapper , ncurses -, pkgconfig +, pkg-config , python3 , expat @@ -69,7 +69,7 @@ rustPlatform.buildRustPackage rec { installShellFiles makeWrapper ncurses - pkgconfig + pkg-config python3 ]; diff --git a/pkgs/applications/terminal-emulators/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix index b72b31babe0..9e2afe57907 100644 --- a/pkgs/applications/terminal-emulators/eterm/default.nix +++ b/pkgs/applications/terminal-emulators/eterm/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , libX11, libXext, libXaw -, pkgconfig, imlib2, libast }: +, pkg-config, imlib2, libast }: stdenv.mkDerivation rec { pname = "eterm"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXaw imlib2 ]; propagatedBuildInputs = [ libast ]; diff --git a/pkgs/applications/terminal-emulators/evilvte/default.nix b/pkgs/applications/terminal-emulators/evilvte/default.nix index 40e723f1682..06dafe09168 100644 --- a/pkgs/applications/terminal-emulators/evilvte/default.nix +++ b/pkgs/applications/terminal-emulators/evilvte/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, makeWrapper, pkgconfig, +{ lib, stdenv, fetchgit, makeWrapper, pkg-config, gnome2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg, configH ? "" }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ gnome2.vte glib pango gnome2.gtk cairo gdk-pixbuf atk freetype xorg.libX11 - xorg.xorgproto xorg.libXext makeWrapper pkgconfig + xorg.xorgproto xorg.libXext makeWrapper pkg-config ]; buildPhase = '' diff --git a/pkgs/applications/terminal-emulators/havoc/default.nix b/pkgs/applications/terminal-emulators/havoc/default.nix index 61fd5831dc9..5df53be3b92 100644 --- a/pkgs/applications/terminal-emulators/havoc/default.nix +++ b/pkgs/applications/terminal-emulators/havoc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig, libxkbcommon, wayland, wayland-protocols }: +, pkg-config, libxkbcommon, wayland, wayland-protocols }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1g05r9j6srwz1krqvzckx80jn8fm48rkb4xp68953gy9yp2skg3k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxkbcommon wayland wayland-protocols ]; dontConfigure = true; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index fbafa1c6bc9..91d7b48738e 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, substituteAll, fetchFromGitHub, python3Packages, libunistring, - harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel, + harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, lcms2, @@ -52,7 +52,7 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ - pkgconfig sphinx ncurses + pkg-config sphinx ncurses installShellFiles ] ++ lib.optionals stdenv.isDarwin [ imagemagick diff --git a/pkgs/applications/terminal-emulators/lilyterm/default.nix b/pkgs/applications/terminal-emulators/lilyterm/default.nix index 9822b180b23..9e2d2a67b44 100644 --- a/pkgs/applications/terminal-emulators/lilyterm/default.nix +++ b/pkgs/applications/terminal-emulators/lilyterm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchFromGitHub -, pkgconfig +, pkg-config , autoconf, automake, intltool, gettext , gtk, vte , flavour ? "stable" @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { inherit (stuff) src version; - nativeBuildInputs = [ pkgconfig autoconf automake intltool gettext ]; + nativeBuildInputs = [ pkg-config autoconf automake intltool gettext ]; buildInputs = [ gtk vte ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/applications/terminal-emulators/lxterminal/default.nix b/pkgs/applications/terminal-emulators/lxterminal/default.nix index 0b992cd2689..a62db90c9e0 100644 --- a/pkgs/applications/terminal-emulators/lxterminal/default.nix +++ b/pkgs/applications/terminal-emulators/lxterminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte, wrapGAppsHook +{ lib, stdenv, fetchurl, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook , libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ - automake autoconf intltool pkgconfig wrapGAppsHook + automake autoconf intltool pkg-config wrapGAppsHook libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs ]; diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 9c01430d6df..94629314341 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoconf, makeDesktopItem +{ stdenv, lib, fetchFromGitHub, pkg-config, autoconf, makeDesktopItem , libX11, gdk-pixbuf, cairo, libXft, gtk3, vte , harfbuzz #substituting glyphs with opentype fonts , fribidi, m17n_lib #bidi and encoding @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1hh196kz2n3asv8r8r2bdk5b2w93zq7rw4880ciiq1554h0ib7fj"; }; - nativeBuildInputs = [ pkgconfig autoconf wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config autoconf wrapGAppsHook ]; buildInputs = [ libX11 gdk-pixbuf.dev diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix index e273e96cbed..d46ff802239 100644 --- a/pkgs/applications/terminal-emulators/mrxvt/default.nix +++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, libX11, libXft, libXi, xorgproto, libSM, libICE -, freetype, pkgconfig, which }: +, freetype, pkg-config, which }: stdenv.mkDerivation { name = "mrxvt-0.5.4"; buildInputs = - [ libX11 libXft libXi xorgproto libSM libICE freetype pkgconfig which ]; + [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ]; configureFlags = [ "--with-x" diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix index 93c3ab099c9..fff534aaff1 100644 --- a/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -1,7 +1,7 @@ { at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub , glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs , libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2 -, pkgconfig, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto +, pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook libxslt ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ]; buildInputs = [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix index 4b6b4eb8184..cb3843cb61e 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, perlPackages, pkgconfig, fribidi }: +{ lib, fetchurl, perlPackages, pkg-config, fribidi }: perlPackages.buildPerlPackage rec { pname = "urxvt-bidi"; @@ -9,7 +9,7 @@ perlPackages.buildPerlPackage rec { sha256 = "1w65xbi4mw5acsrpv3phyzv82ghb29kpbb3b1b1gcinlfxl6f61m"; }; - nativeBuildInputs = [ pkgconfig perlPackages.ExtUtilsPkgConfig ]; + nativeBuildInputs = [ pkg-config perlPackages.ExtUtilsPkgConfig ]; buildInputs = [ fribidi ]; postInstall = '' diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index fe1ddf57679..82536e4b873 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, makeDesktopItem , libX11, libXt, libXft, libXrender , ncurses, fontconfig, freetype -, pkgconfig, gdk-pixbuf, perl +, pkg-config, gdk-pixbuf, perl , perlSupport ? true , gdkPixbufSupport ? true , unicode3Support ? true @@ -36,7 +36,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 libXt libXft ncurses # required to build the terminfo file - fontconfig freetype pkgconfig libXrender + fontconfig freetype pkg-config libXrender ] ++ optional perlSupport perl ++ optional gdkPixbufSupport gdk-pixbuf; diff --git a/pkgs/applications/terminal-emulators/rxvt/default.nix b/pkgs/applications/terminal-emulators/rxvt/default.nix index 2c89940f760..0cd4f13e465 100644 --- a/pkgs/applications/terminal-emulators/rxvt/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, pkgconfig, libtool +, pkg-config, libtool , libX11, libXt, libXpm }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0jfl71gz3k7zh3kxdb8lxi06kajjnx7bq1rxjgk680l209jxask1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libtool libX11 libXt libXpm ]; configurePhase = '' diff --git a/pkgs/applications/terminal-emulators/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix index 6aa1c4b44df..af56f54a414 100644 --- a/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/pkgs/applications/terminal-emulators/sakura/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , cmake -, pkgconfig +, pkg-config , gtk3 , perl , vte @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-cppODnUKQpS9kFkkOqxU3yqAElAVn8VQtQsP4Carkos="; }; - nativeBuildInputs = [ cmake perl pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake perl pkg-config makeWrapper ]; buildInputs = [ gtk3 vte pcre2 glib ]; diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index 77ec7c7bee7..4e43bed0a07 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses +{ lib, stdenv, fetchurl, pkg-config, writeText, libX11, ncurses , libXft, conf ? null, patches ? [], extraLibs ? []}: with lib; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { substituteInPlace config.mk --replace "-lrt" "" ''; - nativeBuildInputs = [ pkgconfig ncurses ]; + nativeBuildInputs = [ pkg-config ncurses ]; buildInputs = [ libX11 libXft ] ++ extraLibs; installPhase = '' diff --git a/pkgs/applications/terminal-emulators/st/xst.nix b/pkgs/applications/terminal-emulators/st/xst.nix index c183bc391de..9634a3be6b6 100644 --- a/pkgs/applications/terminal-emulators/st/xst.nix +++ b/pkgs/applications/terminal-emulators/st/xst.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libX11, ncurses, libXext, libXft, fontconfig }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, ncurses, libXext, libXft, fontconfig }: with lib; @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "1fplgy30gyrwkjsw3z947327r98i13zd1whwkplpj9fzckhb9vs9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 ncurses libXext libXft fontconfig ]; installPhase = '' diff --git a/pkgs/applications/terminal-emulators/stupidterm/default.nix b/pkgs/applications/terminal-emulators/stupidterm/default.nix index 0d8c39a45f5..554d210fbde 100644 --- a/pkgs/applications/terminal-emulators/stupidterm/default.nix +++ b/pkgs/applications/terminal-emulators/stupidterm/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, vte, gtk, pcre2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, vte, gtk, pcre2 }: stdenv.mkDerivation { pname = "stupidterm"; version = "2019-03-26"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ vte gtk pcre2 ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1f73wvqqvj5pr3fvb7jjc4bi1iwgkkknz24k8n69mdb75jnfjipp"; }; - makeFlags = [ "PKGCONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" "binary=stupidterm" ]; + makeFlags = [ "PKGCONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" "binary=stupidterm" ]; installPhase = '' install -D stupidterm $out/bin/stupidterm diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix index 67724d8ec0f..96fd3409dc7 100644 --- a/pkgs/applications/terminal-emulators/termite/default.nix +++ b/pkgs/applications/terminal-emulators/termite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte, gtk3, ncurses, pcre2, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, vte, gtk3, ncurses, pcre2, wrapGAppsHook }: let @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { buildInputs = [ vte-ng gtk3 ncurses pcre2 ]; - nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; + nativeBuildInputs = [ wrapGAppsHook pkg-config ]; outputs = [ "out" "terminfo" ]; diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix index ee9eac8e267..80956a51244 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/applications/terminal-emulators/tilix/default.nix @@ -4,7 +4,7 @@ , meson , ninja , python3 -, pkgconfig +, pkg-config , dmd , dconf , dbus @@ -39,7 +39,7 @@ stdenv.mkDerivation { dmd meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/terminal-emulators/wayst/default.nix b/pkgs/applications/terminal-emulators/wayst/default.nix index 99ee326aebf..528e3f50ea0 100644 --- a/pkgs/applications/terminal-emulators/wayst/default.nix +++ b/pkgs/applications/terminal-emulators/wayst/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, pkgconfig +, pkg-config , freetype , fontconfig , libGL @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALL_DIR=\${out}/bin" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fontconfig diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index a8bc41dfa6c..ba6c9bc8fdf 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkg-config , makeWrapper, nixosTests, writeScript, common-updater-scripts, git, nixfmt, nix , gnused, coreutils, enableDecLocator ? true }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ncurses freetype fontconfig - pkgconfig + pkg-config xorg.libXft xorg.luit makeWrapper diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix index 875f9dfa485..c185a4fb759 100644 --- a/pkgs/applications/version-management/bitkeeper/default.nix +++ b/pkgs/applications/version-management/bitkeeper/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, perl, gperf, bison, groff -, pkgconfig, libXft, pcre +, pkg-config, libXft, pcre , libtomcrypt, libtommath, lz4 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl gperf bison groff libXft pcre libtomcrypt libtommath lz4 diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 831db07ffea..f48fe4b1ec4 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt -, docbook_xsl, pkgconfig, luajit +, docbook_xsl, pkg-config, luajit , coreutils, gnused, groff, docutils , gzip, bzip2, lzip, xz, zstd , python, wrapPython, pygments, markdown @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; }; - nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; + nativeBuildInputs = [ pkg-config ] ++ [ python wrapPython ]; buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 0117b6cb3b6..fb3f555cb13 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -5,7 +5,7 @@ , libssh , cmake , perl -, pkgconfig +, pkg-config , rustPlatform , curl , libiconv @@ -30,7 +30,7 @@ buildRustPackage rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config perl ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index d55ad89ca56..c7453aff85b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "git-gone"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1g2jijx8y34lid9qwa26v4svab5v9ki6gn9vcfiy61dqa964c3l9"; - nativeBuildInputs = [ pkgconfig makeWrapper installShellFiles ]; + nativeBuildInputs = [ pkg-config makeWrapper installShellFiles ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index d594b996141..b01976f7632 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkgconfig, openssl, darwin }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkg-config, openssl, darwin }: with rustPlatform; @@ -15,7 +15,7 @@ buildRustPackage rec { cargoSha256 = "sha256-D1CIITuZSAsKYsK8U0q8HwPsYCyrfkTXZThxufEEkWU="; - nativeBuildInputs = [ pkgconfig installShellFiles ]; + nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index 480725797a2..9b2853551c2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , rustPlatform , Security -, pkgconfig, openssl +, pkg-config, openssl }: rustPlatform.buildRustPackage rec { @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-lvxEYjVMJoAFFRG5iVfGwxUeJObIxfEaWokk69l++nI="; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index d7258dd3660..90f6ba5ac5a 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -15,7 +15,7 @@ , sendEmailSupport , darwin , withLibsecret ? false -, pkgconfig, glib, libsecret +, pkg-config, glib, libsecret , gzip # needed at runtime by gitweb.cgi }: @@ -73,7 +73,7 @@ stdenv.mkDerivation { ++ lib.optionals guiSupport [tcl tk] ++ lib.optionals withpcre2 [ pcre2 ] ++ lib.optionals stdenv.isDarwin [ darwin.Security ] - ++ lib.optionals withLibsecret [ pkgconfig glib libsecret ]; + ++ lib.optionals withLibsecret [ pkg-config glib libsecret ]; # required to support pthread_cancel() NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" diff --git a/pkgs/applications/version-management/git-and-tools/gitin/default.nix b/pkgs/applications/version-management/git-and-tools/gitin/default.nix index c9111ea2c32..e2aaafea202 100644 --- a/pkgs/applications/version-management/git-and-tools/gitin/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitin/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , buildGoPackage , fetchFromGitHub -, pkgconfig +, pkg-config , libgit2_0_27 }: @@ -20,7 +20,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgit2_0_27 ]; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index f7aae5ba8d2..04103465189 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkgconfig, readline +{ lib, stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline , cmake }: let version = "0.3.2"; @@ -8,7 +8,7 @@ buildGoPackage { inherit version; buildInputs = [ ncurses readline curl ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; goPackagePath = "github.com/rgburke/grv"; diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index f907cdac036..6ac6cde44a8 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 -, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkgconfig +, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkg-config }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0wxcbfqsk8p84zizy6lf3gp5j122wrf8c7xlipki6nhcfhksn33b"; }; - nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; + nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; autoreconfFlags = "-I tools -v"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c16e66c9e81..acfd91be331 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby -, bundlerEnv, pkgconfig +, bundlerEnv, pkg-config # libgit2 + dependencies , libgit2, openssl, zlib, pcre, http-parser }: @@ -50,7 +50,7 @@ in buildGoModule rec { }; buildFlags = [ "-tags=static,system_libgit2" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ rubyEnv.wrappedRuby libgit openssl zlib pcre http-parser ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index ba359bc9779..51fc538261d 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - # Needed to get openssl-sys to use pkgconfig. + # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; meta = with lib; { diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 048ad403665..c4a86b8d4be 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre +{ lib, stdenv, fetchurl, SDL2, ftgl, pkg-config, libpng, libjpeg, pcre , SDL2_image, freetype, glew, libGLU, libGL, boost, glm }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16p7b1x4r0915w883lp374jcdqqja37fnb7m8vnsfnl2n64gi8qr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL boost glm freetype diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 82513bab952..d78023d8468 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }: +{ lib, stdenv, fetchmtn, qt4, qmake4Hook, pkg-config, graphviz }: let version = "1.0-mtn-head"; in stdenv.mkDerivation { @@ -19,7 +19,7 @@ stdenv.mkDerivation { patches = [ ./parallel-building.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ qt4 qmake4Hook graphviz ]; qmakeFlags = [ "guitone.pro" ]; diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index f4e21dd4149..5c260cc8e6c 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper, glib +{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkg-config, makeWrapper, glib , libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw }: # We need an old version of Graphviz for format compatibility reasons. # This version is vulnerable, but monotone-viz will never feed it bad input. let graphviz_2_0 = import ./graphviz-2.0.nix { - inherit lib stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw + inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd libwebp; }; in let inherit (gnome2) libgnomecanvas; in @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "1.0.2"; pname = "monotone-viz"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4]; src = fetchurl { url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz"; diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index c72256807dd..8ecc5bf9ac8 100644 --- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw +{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libpng, libjpeg, expat, libXaw , yacc, libtool, fontconfig, pango, gd, libwebp }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd libwebp diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index c8c2d5b048b..f20d827dc5f 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, boost, zlib, botan, libidn -, lua, pcre, sqlite, perl, pkgconfig, expect +, lua, pcre, sqlite, perl, pkg-config, expect , bzip2, gmp, openssl }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost zlib botan libidn lua pcre sqlite expect openssl gmp bzip2 ]; diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index 4bfe6543805..fbb4a7a5e49 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libjpeg, libtiff, libpng, freetype , fltk, gtk , libX11, libXext, libICE @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ]; - # A strange type of bug: dbus is not immediately found by pkgconfig + # A strange type of bug: dbus is not immediately found by pkg-config preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)" ''; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 7f6dc3df192..a526636063e 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk-pixbuf +{ lib, stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkg-config, gdk-pixbuf , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobject-introspection , which, dbus, nettools, git, doxygen @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { doxygen imagemagick makeWrapper - pkgconfig + pkg-config xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs asciidoctor diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index dc80b54bc69..69c9cc1c37c 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkg-config }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0f9xmki2hx10k8iisfzc7nm1l31zkf1r06pdgn06ar9w9nizrld9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXinerama libXrandr libXft yacc ]; prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index d58b505ad4c..1724a2c9824 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkgconfig, xorg +{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg , enableAlsaUtils ? true, alsaUtils, coreutils , enableNetwork ? true, dnsutils, iproute, wirelesstools }: @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { sha256 = "172qkzbi37j6wx81pyqqffi9wxbg3bf8nis7d15ncn1yfd5r4gqh"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; cargoSha256 = "041sd9zm1c3v6iihnwjcya2xg5yxb2y4biyxpjlfblz2srxa15dm"; diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix index 2be20bc6db0..84380bfc9d8 100644 --- a/pkgs/applications/window-managers/dzen2/default.nix +++ b/pkgs/applications/window-managers/dzen2/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchurl, pkgconfig, libX11, libXft, libXinerama, libXpm }: +{ lib, stdenv, fetchurl, pkg-config, libX11, libXft, libXinerama, libXpm }: stdenv.mkDerivation { name = "dzen2-0.9.5"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXft libXinerama libXpm ]; src = fetchurl { diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index e927db36fdd..1a87f29f67c 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libX11, libXmu, libXpm, gtk2, libpng, libjpeg, libtiff, librsvg, gdk-pixbuf, gdk-pixbuf-xlib }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965"; }; buildInputs = - [ pkgconfig libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ]; + [ pkg-config libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ]; preConfigure = "patchShebangs ."; diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix index 4cc4601d0d4..36a22cb46d7 100644 --- a/pkgs/applications/window-managers/fluxbox/default.nix +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , freetype, fribidi , libXext, libXft, libXpm, libXrandr, libXrender, xorgproto , libXinerama @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype fribidi libXext libXft libXpm libXrandr libXrender xorgproto libXinerama imlib2 ]; diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index c691bcf59ed..ae5dad94f2e 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -1,5 +1,5 @@ { gestures ? false -, lib, stdenv, fetchurl, pkgconfig +, lib, stdenv, fetchurl, pkg-config , cairo, fontconfig, freetype, libXft, libXcursor, libXinerama , libXpm, libXt, librsvg, libpng, fribidi, perl , libstroke ? null @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1bliqcnap7vb3m2rn8wvxyfhbf35h9x34s41fl4301yhrkrlrihv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo fontconfig freetype libXft libXcursor libXinerama libXpm libXt diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 1ec1e2e995c..ad45f01915d 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig, python3, libX11, libXext, libXinerama, libXrandr, asciidoc +{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, asciidoc , xdotool, xorgserver, xsetroot, xterm, runtimeShell , nixosTests }: @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config python3 ] ++ lib.optional (!cross) asciidoc; diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 89fa7f7ccf1..2325deaf37c 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchzip, - pkgconfig, bmake, + pkg-config, bmake, cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman, libucl, wayland, wayland-protocols, wlroots, features ? { @@ -23,7 +23,7 @@ stdenv.mkDerivation { sha256 = "0sln1n5f67i3vxkybfi6xhzplb45djqyg272vqkv64m72rmm8875"; }; - nativeBuildInputs = [ pkgconfig bmake ]; + nativeBuildInputs = [ pkg-config bmake ]; buildInputs = [ cairo diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix index 517971905f6..a2ee445eaf1 100644 --- a/pkgs/applications/window-managers/i3/easyfocus.nix +++ b/pkgs/applications/window-managers/i3/easyfocus.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, xorgproto, libxcb, xcbutilkeysyms +{ lib, stdenv, fetchFromGitHub, pkg-config, xorgproto, libxcb, xcbutilkeysyms , xorg , i3ipc-glib , glib }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "1db23vzzmp0hnfss1fkd80za6d2pajx7hdwikw50pk95jq0w8wfm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb xcbutilkeysyms xorgproto xorg.libX11.dev i3ipc-glib glib.dev ]; # Makefile has no rule for 'install' diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix index 36b48fa3b07..572b12d986c 100644 --- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix +++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, xorgproto, libxcb +{ lib, stdenv, fetchFromGitHub, pkg-config, xorgproto, libxcb , autoreconfHook, json-glib, gtk-doc, which , gobject-introspection }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "01fzvrbnzcwx0vxw29igfpza9zwzp2s7msmzb92v01z0rz0y5m0p"; }; - nativeBuildInputs = [ autoreconfHook which pkgconfig ]; + nativeBuildInputs = [ autoreconfHook which pkg-config ]; buildInputs = [ libxcb json-glib gtk-doc xorgproto gobject-introspection ]; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 7fe48189752..81ef536a5f7 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxcb, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libxcb, xcbutilkeysyms , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile, libjpeg_turbo, xcbutilxrm }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "10h50a6p9ivqjz8hd5pn9l03vz6y9dxdx68bprqssfzdkzqnzaiv"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxcb xcbutilkeysyms xcbutilimage pam libX11 libev cairo libxkbcommon libxkbfile libjpeg_turbo xcbutilxrm ]; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 3b991d091ce..03506e889d7 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage, +{ fetchurl, lib, stdenv, which, pkg-config, libxcb, xcbutilkeysyms, xcbutilimage, xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "02szjsaz7rqrdkd0r2nwgwa85c4hwfrcskxw7ryk695kmjcfhzv3"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage xcbutilxrm pam libX11 libev cairo libxkbcommon libxkbfile ]; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index d49f8ff6bd6..b9dbe6136b4 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -1,7 +1,7 @@ { lib, stdenv , rustPlatform , fetchFromGitHub -, pkgconfig +, pkg-config , makeWrapper , dbus , libpulseaudio @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0qqkcgl9iz4kxl1a2vv2p7vy7wxn970y28jynf3n7hfp16i3liy2"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ dbus libpulseaudio notmuch ]; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 00fd501c805..935a6c3c23b 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: +{ fetchurl, lib, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { name = "i3status-2.13"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0rhlzb96mw64z2jnhwz9nibc7pxg549626lz5642xxk5hpzwk2ff"; }; - nativeBuildInputs = [ pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; + nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; buildInputs = [ libconfuse yajl alsaLib libpulseaudio libnl ]; makeFlags = [ "all" "PREFIX=$(out)" ]; diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index 6f6a63eca09..db6ec29d9e9 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, rustPlatform -, xorg, python3, pkgconfig, cairo, libxkbcommon }: +, xorg, python3, pkg-config, cairo, libxkbcommon }: rustPlatform.buildRustPackage rec { pname = "wmfocus"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0rczas6sgcppacz48xx7sarkvc4s2sgcdz6c661d7vcry1y46xms"; - nativeBuildInputs = [ python3 pkgconfig ]; + nativeBuildInputs = [ python3 pkg-config ]; buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; # For now, this is the only available featureset. This is also why the file is diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 510003e52ea..3c97c5630b0 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool, gettext +{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf, libtool, gettext , which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp , libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-Fix-Gettext-Requirement.patch ]; - nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; + nativeBuildInputs = [ pkg-config automake autoconf libtool gettext which ]; buildInputs = [ libX11 diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix index 58105ec219b..2f45ba36112 100644 --- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix +++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }: stdenv.mkDerivation { pname = "jwm-settings-manager"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - pkgconfig + pkg-config gettext ]; diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index 9496d306bc7..8f684fec620 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, dbus-glib, autoreconfHook, xorg }: +{ lib, stdenv, fetchFromGitHub, pkg-config, dbus-glib, autoreconfHook, xorg }: stdenv.mkDerivation { pname = "kbdd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "068iqkqxh7928xlmz2pvnykszn9bcq2qgkkiwf37k1vm8fdmgzlj"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ xorg.libX11 dbus-glib ]; meta = { diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index 035fcd44dd3..51bb3010d33 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, pkgconfig, libmatchbox, libX11, libXext }: +{ lib, stdenv, fetchurl, pkg-config, libmatchbox, libX11, libXext }: stdenv.mkDerivation rec { pname = "matchbox"; version = "1.2"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmatchbox ]; NIX_LDFLAGS = "-lX11 -L${libX11}/lib -lXext -L${libXext}/lib"; diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix index da6b5e2825d..bf017ae085a 100644 --- a/pkgs/applications/window-managers/neocomp/default.nix +++ b/pkgs/applications/window-managers/neocomp/default.nix @@ -17,7 +17,7 @@ , libXrandr , libXrender , pcre -, pkgconfig +, pkg-config }: let rev = "v0.6-17-g271e784"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { libXrandr libXrender pcre - pkgconfig + pkg-config ]; makeFlags = [ diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index 5d688f5e235..e59103d7d6d 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , lua, gettext, which, groff, xmessage, xterm , readline, fontconfig, libX11, libXext, libSM , libXinerama, libXrandr, libXft @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "14swd0yqci8lxn259fkd9w92bgyf4rmjwgvgyqp78wlfix6ai4mv"; }; - nativeBuildInputs = [ pkgconfig makeWrapper groff ]; + nativeBuildInputs = [ pkg-config makeWrapper groff ]; buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM libXinerama libXrandr libXft xlibsWrapper ]; diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 9b58bb1093d..5e3392b2002 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, python3 +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, python3 , libxml2, libXinerama, libXcursor, libXau, libXrandr, libICE, libSM , imlib2, pango, libstartup_notification, makeWrapper }: @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config makeWrapper python3.pkgs.wrapPython ]; diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index 52ca2b71073..0124261e423 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , freetype, fribidi , libSM, libICE, libXt, libXaw, libXmu , libXext, libXft, libXpm, libXrandr @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "oroborus"; version = "2.0.20"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xorgproto libXinerama ]; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 284a12e65f5..709a5b14736 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python37Packages, glib, cairo, pango, pkgconfig, libxcb, xcbutilcursor }: +{ lib, stdenv, fetchFromGitHub, python37Packages, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }: let cairocffi-xcffib = python37Packages.cairocffi.override { withXcffib = true; @@ -31,7 +31,7 @@ python37Packages.buildPythonApplication rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libxcb cairo pango python37Packages.xcffib ]; pythonPath = with python37Packages; [ diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index 30195ab9147..472707bf35c 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl, autoconf, automake +{ lib, stdenv, fetchurl, pkg-config, perl, autoconf, automake , libX11, xorgproto, libXt, libXpm, libXft, libXtst, libXi , libXrandr, fontconfig, freetype, readline }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--enable-history" ]; - nativeBuildInputs = [ pkgconfig autoconf automake ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; buildInputs = [ perl diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index 6598fefaebd..be2c5bc3d6e 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, xorg }: +{ lib, stdenv, fetchFromGitHub, pkg-config, xorg }: stdenv.mkDerivation { pname = "spectrwm"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0bf0d25yr0craksamczn2mdy6cjp27l88smihlw9bw4p6a2qhi41"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = with xorg; [ libXrandr libXcursor diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix index a4532960619..57b81c7831c 100644 --- a/pkgs/applications/window-managers/sway/bg.nix +++ b/pkgs/applications/window-managers/sway/bg.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, scdoc +, meson, ninja, pkg-config, scdoc , wayland, wayland-protocols, cairo, gdk-pixbuf }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1lmqz5bmig90gq2m7lwf02d2g7z4hzf8fhqz78c8vk92c6p4xwbc"; }; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ]; mesonFlags = [ diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index 546999e6035..acfbb1ad36b 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, scdoc +, meson, ninja, pkg-config, scdoc , wayland, wayland-protocols, systemd }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace "version: '1.5'" "version: '${version}'" ''; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland wayland-protocols systemd ]; mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=enabled" ]; diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index e90aaf5efc2..eff8710ebfc 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, - meson, ninja, pkgconfig, scdoc, + meson, ninja, pkg-config, scdoc, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build ''; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; mesonFlags = [ diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 51e7bf34594..9b1523421ee 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, scdoc +, meson, ninja, pkg-config, scdoc , wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace "version: '1.4'" "version: '${version}'" ''; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; mesonFlags = [ diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index e7fc397e123..c210b39fe18 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, gtk2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, gtk2 }: stdenv.mkDerivation rec { name = "trayer-1.1.8"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gdk-pixbuf gtk2 ]; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 1b70706d0d3..143ee83d2d1 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, ncurses, pkgconfig, glib, libviper, libpseudo, gpm, +{lib, stdenv, fetchurl, ncurses, pkg-config, glib, libviper, libpseudo, gpm, libvterm}: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/include ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ]; meta = with lib; { diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix index 134dd525ce0..f4fea3f434c 100644 --- a/pkgs/applications/window-managers/windowlab/default.nix +++ b/pkgs/applications/window-managers/windowlab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libX11, libXext, libXft }: let version = "1.40"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1fx4jwq4s98p2wpvawsiww7d6568bpjgcjpks61dzfj8p2j32s4d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXft ]; postPatch = diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix index 6bb0586ffed..e56ff2512c1 100644 --- a/pkgs/applications/window-managers/windowmaker/default.nix +++ b/pkgs/applications/window-managers/windowmaker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libX11, libXext, libXft, libXmu, libXinerama, libXrandr, libXpm , imagemagick, libpng, libjpeg, libexif, libtiff, libungif, libwebp }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "055pqvlkhipyjn7m6bb3fs4zz9rd1ynzl0mmwbhp05ihc3zmh8zj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXft libXmu libXinerama libXrandr libXpm imagemagick libpng libjpeg libexif libtiff libungif libwebp ]; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix index cde55e01698..ced4cad8055 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }: +{ lib, stdenv, fetchurl, pkg-config, libX11, libXpm, libXext, libXfixes, libXmu }: stdenv.mkDerivation rec { pname = "wmsystemtray"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXpm libXext libXfixes libXmu ]; meta = with lib; { diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index f51dbfbee5a..b78b7c01570 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, pkgconfig, libixp_hg, txt2tags, dash, python, which +{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python, which , libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { EOF ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ unzip libixp_hg txt2tags dash python which libX11 libXrender libXext libXinerama libXrandr libXft ]; diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index c75a481e19a..ebabcf196d5 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib , desktopSupport ? "gnomeflashback", xorg , gtk2 , gtk3, gnome3, mate @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] ; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "--with-panel=${desktopSupport}" ]; diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index c4b4f5cc8c4..ec15f7e3627 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cairo, gdk-pixbuf, libconfig, pango, pkgconfig +{ stdenv, fetchFromGitHub, cairo, gdk-pixbuf, libconfig, pango, pkg-config , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl , configFile ? null, lib , rev, sha256, version, patches ? [] @@ -19,7 +19,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo gdk-pixbuf libconfig pango xcbutilwm docbook_xsl alsaLib wirelesstools asciidoc libxslt makeWrapper diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix index dae9ed888c7..440b10044f0 100644 --- a/pkgs/build-support/build-dotnet-package/default.nix +++ b/pkgs/build-support/build-dotnet-package/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, pkgconfig, mono, dotnetbuildhelpers }: +{ stdenv, lib, makeWrapper, pkg-config, mono, dotnetbuildhelpers }: attrsOrig @ { baseName @@ -19,7 +19,7 @@ attrsOrig @ attrs = { name = "${baseName}-${version}"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono dotnetbuildhelpers diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix index 6ab697c3696..15d7b315358 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, meson, ninja, pkgconfig, glib }: +{ lib, stdenv, meson, ninja, pkg-config, glib }: stdenv.mkDerivation { name = "chrootenv"; src = ./.; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ glib ]; meta = with lib; { diff --git a/pkgs/build-support/dotnetbuildhelpers/default.nix b/pkgs/build-support/dotnetbuildhelpers/default.nix index 809619ed55d..4348832ac04 100644 --- a/pkgs/build-support/dotnetbuildhelpers/default.nix +++ b/pkgs/build-support/dotnetbuildhelpers/default.nix @@ -1,4 +1,4 @@ -{ runCommand, mono, pkgconfig }: +{ runCommand, mono, pkg-config }: runCommand "dotnetbuildhelpers" { preferLocalBuild = true; } @@ -12,7 +12,7 @@ cp -v "$script" "$target"/"$scriptName" chmod 755 "$target"/"$scriptName" patchShebangs "$target"/"$scriptName" - substituteInPlace "$target"/"$scriptName" --replace pkg-config ${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config + substituteInPlace "$target"/"$scriptName" --replace pkg-config ${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config substituteInPlace "$target"/"$scriptName" --replace monodis ${mono}/bin/monodis done '' diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 89edbd513d5..f853f37fec6 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -122,7 +122,7 @@ rec { pkgs.coreutils pkgs.findutils pkgs.gcc - pkgs.pkgconfig + pkgs.pkg-config ]} export PKG_CONFIG_PATH=${concatMapStringsSep ":" (pkg: "${pkg}/lib/pkgconfig") libraries} gcc \ diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index b62b9c95ef6..670f7f94193 100644 --- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }: +{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkg-config, npapi_sdk, bash, bc }: stdenv.mkDerivation rec { pname = "adoptopenjdk-icedtea-web"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0pxijw9v5k4j840jczglx9qyfd57df390g5jdaz3qafblfg0k10n"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig bc ]; + nativeBuildInputs = [ autoreconfHook pkg-config bc ]; buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ]; preConfigure = '' diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index df7b6585205..1e9fd8505c5 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -11,7 +11,7 @@ , perl , flex , bison -, pkgconfig +, pkg-config , itktcl , incrtcl , tcl @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { perl flex bison - pkgconfig + pkg-config ghcWithPackages ]; diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index bcac4eeb9c4..1d8b0137eb0 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, crystal, shards, git, pkgconfig, which, linkFarm, fetchFromGitHub, installShellFiles }: +{ stdenv, lib, crystal, shards, git, pkg-config, which, linkFarm, fetchFromGitHub, installShellFiles }: { # Some projects do not include a lock file, so you can pass one @@ -61,7 +61,7 @@ stdenv.mkDerivation (mkDerivationArgs // { buildInputs = args.buildInputs or [ ] ++ [ crystal ] ++ lib.optional (format != "crystal") shards; - nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkgconfig which ]; + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkg-config which ]; buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([ "runHook preBuild" diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index fa8198fabad..b449d66d3ba 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -18,7 +18,7 @@ , makeWrapper , openssl , pcre -, pkgconfig +, pkg-config , readline , tzdata , which @@ -134,7 +134,7 @@ let buildInputs = commonBuildInputs extraBuildInputs; - nativeBuildInputs = [ binary makeWrapper which pkgconfig llvmPackages.llvm ]; + nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm ]; makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" @@ -158,7 +158,7 @@ let install -Dm755 .build/crystal $bin/bin/crystal wrapProgram $bin/bin/crystal \ - --suffix PATH : ${lib.makeBinPath [ pkgconfig llvmPackages.clang which ]} \ + --suffix PATH : ${lib.makeBinPath [ pkg-config llvmPackages.clang which ]} \ --suffix CRYSTAL_PATH : lib:$lib/crystal \ --suffix CRYSTAL_LIBRARY_PATH : ${ lib.makeLibraryPath (commonBuildInputs extraBuildInputs) diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 0a694e29ee8..c5d33590daa 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, flex, bison, pkgconfig, which +{ stdenv, lib, fetchgit, flex, bison, pkg-config, which , pythonSupport ? false, python, swig }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0li992wwd7kgy71bikanqky49y4hq3p3vx35p2hvyxy1k0wfy7i8"; }; - nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python swig ]; + nativeBuildInputs = [ flex bison pkg-config which ] ++ lib.optionals pythonSupport [ python swig ]; postPatch = '' patchShebangs pylibfdt/ diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index 2c7edb9c170..eba5b0f584c 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, git, - rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses, + rlwrap, curl, pkg-config, perl, makeWrapper, tzdata, ncurses, pango, cairo, gtk2, gdk-pixbuf, gtkglext, mesa, xorg, openssl, unzip }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ./fuel-dir.patch ]; - buildInputs = with xorg; [ git rlwrap curl pkgconfig perl makeWrapper + buildInputs = with xorg; [ git rlwrap curl pkg-config perl makeWrapper libX11 pango cairo gtk2 gdk-pixbuf gtkglext mesa libXmu libXt libICE libSM openssl unzip ]; diff --git a/pkgs/development/compilers/flux/default.nix b/pkgs/development/compilers/flux/default.nix index c599c9f8baf..75386f21f74 100644 --- a/pkgs/development/compilers/flux/default.nix +++ b/pkgs/development/compilers/flux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "flux"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "11f3ypg0sdq5kj69zgz6kih1yrzgm48r16spyvzwvlswng147410"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { description = "An interface description language used by DirectFB"; diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 0c60403a6be..53c9aeea3e0 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -1,6 +1,6 @@ # Temporarily avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it -{ stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }: +{ stdenv, fetchurl, mono, pkg-config, dotnetbuildhelpers, autoconf, automake, which }: stdenv.mkDerivation rec { pname = "fsharp"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mvmvwwpl4zq0yvgzdizww8l9azvlrc82xm32nz1fi1nw8x5qfqk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono dotnetbuildhelpers autoconf automake which ]; configurePhase = '' diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix index 6475deb1026..7c1a2fd32ef 100644 --- a/pkgs/development/compilers/fsharp41/default.nix +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -1,6 +1,6 @@ # Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it -{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }: +{ stdenv, fetchurl, pkg-config, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }: stdenv.mkDerivation rec { pname = "fsharp"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0cv6p5pin962vhbpsji40nkckkag5c96kq5qihvg60pc1z821p0i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 617a19e238b..3d2c754c6a2 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -20,7 +20,7 @@ , libelf # optional, for link-time optimizations (LTO) , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null +, zip ? null, unzip ? null, pkg-config ? null , gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xorgproto ? null @@ -161,7 +161,7 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkgconfig); + ++ (optional javaAwtGtk pkg-config); # For building runtime libs depsBuildTarget = diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 7ea80ffbeb3..b3192e44cfe 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -20,7 +20,7 @@ , libelf # optional, for link-time optimizations (LTO) , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null +, zip ? null, unzip ? null, pkg-config ? null , gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xorgproto ? null @@ -174,7 +174,7 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkgconfig); + ++ (optional javaAwtGtk pkg-config); # For building runtime libs depsBuildTarget = diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 029777430ff..908f7e0f699 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -23,7 +23,7 @@ , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , gnatboot ? null -, zip ? null, unzip ? null, pkgconfig ? null +, zip ? null, unzip ? null, pkg-config ? null , gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xorgproto ? null @@ -190,7 +190,7 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkgconfig) + ++ (optional javaAwtGtk pkg-config) ++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex); # For building runtime libs diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index c6c81491fe6..8a04bc0c079 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -12,7 +12,7 @@ , makeWrapper , xorg , gmp -, pkgconfig +, pkg-config , gcc , lib , ghcjsDepOverrides ? (_:_:{}) @@ -73,7 +73,7 @@ in stdenv.mkDerivation { makeWrapper xorg.lndir gmp - pkgconfig + pkg-config ] ++ lib.optionals stdenv.isDarwin [ gcc # https://github.com/ghcjs/ghcjs/issues/663 ]; diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index f48cd6dfa1b..e06c16058d1 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkgconfig, libtool +{ config, stdenv, fetchurl, pkg-config, libtool , zip, libffi, libsigsegv, readline, gmp , gnutls, gnome2, cairo, SDL, sqlite , emacsSupport ? config.emacsSupport or false, emacs ? null }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { # The dependencies and their justification are explained at # http://smalltalk.gnu.org/download - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk cairo SDL sqlite diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index a37d5c3d2cf..6dc347d9012 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell , buildPackages , pkgsBuildTarget @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; + nativeBuildInputs = [ perl which pkg-config patch procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index 47bf9cebd4c..d5415b208a8 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell , buildPackages , pkgsBuildTarget @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; + nativeBuildInputs = [ perl which pkg-config patch procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 6bc32b07c3d..032a8933db9 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, tzdata, iana-etc, libcCross -, pkgconfig +, pkg-config , pcre , Security }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1zdyf883awaqdzm4r3fs76nbpiqx3iswl2p4qxclw2sl5vvynas5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre ]; depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/compilers/go/2-dev.nix b/pkgs/development/compilers/go/2-dev.nix index 35d3365768a..c43b4d0175a 100644 --- a/pkgs/development/compilers/go/2-dev.nix +++ b/pkgs/development/compilers/go/2-dev.nix @@ -1,5 +1,5 @@ { pkgs, stdenv, fetchurl, fetchgit, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell , buildPackages , pkgsBuildTarget @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; + nativeBuildInputs = [ perl which pkg-config patch procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 8ca85817f9e..7d0c67a1acb 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , bison , flex diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix index 8b91e3f2c6d..b20a0899f03 100644 --- a/pkgs/development/compilers/intercal/default.nix +++ b/pkgs/development/compilers/intercal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig +, pkg-config , bison, flex , makeWrapper }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig bison flex makeWrapper ]; + [ pkg-config bison flex makeWrapper ]; # Intercal invokes gcc, so we need an explicit PATH postInstall = '' diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 705b222a86c..b31a2daa1f8 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig +{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkg-config , git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1qv47zaa0vzhjlq5wb71627n7dbsxpc1gqpg0hsngjxnbnh1q46g"; }; - nativeBuildInputs = [ cmake pkgconfig git ]; + nativeBuildInputs = [ cmake pkg-config git ]; buildInputs = [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil libmysqlclient mbedtls openssl libpthreadstubs ] diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 326aef1a562..fc896f43d28 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, bash, pkgconfig, autoconf, cpio, file, which, unzip +{ stdenv, lib, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap @@ -25,7 +25,7 @@ let sha256 = "11j2rqz9nag5y562g99py4p72f2kv4wwwyrnaspmrzax00wynyx7"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 1de5d84a13b..75f114e9fbf 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip +{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk11 @@ -22,7 +22,7 @@ let sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 3c7ddfb8dd9..ee99cb93a1a 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip +{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk13-bootstrap @@ -22,7 +22,7 @@ let sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 050ca2a564a..96a01b0cd92 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, lndir, bash, cpio, file, which, unzip, zip +{ stdenv, lib, fetchurl, pkg-config, lndir, bash, cpio, file, which, unzip, zip , cups, freetype, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib @@ -83,7 +83,7 @@ let outputs = [ "out" "jre" ]; - nativeBuildInputs = [ pkgconfig lndir ]; + nativeBuildInputs = [ pkg-config lndir ]; buildInputs = [ cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 513f4d968f6..30762d7811a 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeText, gradleGen, pkgconfig, perl, cmake +{ stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake , gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg_3, python, ruby , openjdk11-bootstrap }: @@ -20,7 +20,7 @@ let }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; - nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index f406a3959fd..d491250bd93 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen -, pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib +, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib , ffmpeg_3, python, ruby }: let @@ -22,7 +22,7 @@ let }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; - nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index e820b982620..40acb925d10 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,4 +1,4 @@ -{ stdenv, file, curl, pkgconfig, python3, openssl, cmake, zlib +{ stdenv, file, curl, pkg-config, python3, openssl, cmake, zlib , installShellFiles, makeWrapper, libiconv, cacert, rustPlatform, rustc , CoreFoundation, Security }: @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage { # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; - nativeBuildInputs = [ pkgconfig cmake installShellFiles makeWrapper ]; + nativeBuildInputs = [ pkg-config cmake installShellFiles makeWrapper ]; buildInputs = [ cacert file curl python3 openssl zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index 7534a52fe0f..c57b28aee51 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -1,5 +1,5 @@ { stdenv, makeWrapper, fetchFromGitHub, rustPlatform -, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv +, openssh, openssl, pkg-config, cmake, zlib, curl, libiconv , CoreFoundation, Security }: rustPlatform.buildRustPackage { @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage { # rls-rustc links to rustc_private crates CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ openssh openssl curl zlib libiconv makeWrapper rustPlatform.rust.rustc.llvm ] ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 570cd8b796f..a5c24a5fc69 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -2,7 +2,7 @@ , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget , fetchurl, file, python3 , darwin, cmake, rust, rustPlatform -, pkgconfig, openssl +, pkg-config, openssl , which, libffi , withBundledLLVM ? false , enableRustcDev ? true @@ -133,7 +133,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ file python3 rustPlatform.rust.rustc cmake - which libffi removeReferencesTo pkgconfig + which libffi removeReferencesTo pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix index dcc3457fe11..ff40c622f1e 100644 --- a/pkgs/development/compilers/sagittarius-scheme/default.nix +++ b/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , cmake -, pkgconfig +, pkg-config , libffi , boehmgc , openssl @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # build extensions export ${platformLdLibraryPath}="$(pwd)/build" ''; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libffi boehmgc openssl zlib ] ++ stdenv.lib.optional odbcSupport libiodbc; diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index e94ebab50e6..f62e86461f9 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused -, libpthreadstubs, pango, pkgconfig, libpulseaudio, which }: +, libpthreadstubs, pango, pkg-config, libpulseaudio, which }: stdenv.mkDerivation rec { pname = "squeak"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils dbus freetype glib gnused libpthreadstubs pango libpulseaudio which ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; postPatch = '' for i in squeak.in squeak.sh.in; do diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index dadf374d5b6..66d2add98b1 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib , libarchive, db, pcre, libedit, libossp_uuid, libXpm -, libSM, libXt, freetype, pkgconfig, fontconfig +, libSM, libXt, freetype, pkg-config, fontconfig , cmake, libyaml, Security , libjpeg, libX11, libXext, libXft, libXinerama , extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ] @@ -26,7 +26,7 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ gmp readline openssl libarchive libyaml db pcre libedit libossp_uuid diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 2cabacadd75..6b873810764 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -7,7 +7,7 @@ , perl , libedit , ninja -, pkgconfig +, pkg-config , sqlite , swig , bash @@ -141,7 +141,7 @@ stdenv.mkDerivation { makeWrapper ninja perl - pkgconfig + pkg-config python rsync which @@ -155,7 +155,7 @@ stdenv.mkDerivation { libgit2 python ]; - propagatedUserEnvPkgs = [ git pkgconfig ]; + propagatedUserEnvPkgs = [ git pkg-config ]; hardeningDisable = [ "format" ]; # for LLDB diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 1964d74cf3a..47a11489917 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, autoreconfHook +{ stdenv, lib, fetchurl, fetchpatch, pkg-config, flex, bison, libxslt, autoconf, autoreconfHook , graphviz, glib, libiconv, libintl, libtool, expat, substituteAll }: @@ -70,7 +70,7 @@ let outputs = [ "out" "devdoc" ]; nativeBuildInputs = [ - pkgconfig flex bison libxslt + pkg-config flex bison libxslt ] ++ lib.optional (stdenv.isDarwin && (lib.versionAtLeast version "0.38")) expat ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure ++ extraNativeBuildInputs; diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 31867d16b4c..15e3ccbb972 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile, guile-lib, cairo, expat }: +{ lib, stdenv, fetchurl, pkg-config, guile, guile-lib, cairo, expat }: stdenv.mkDerivation rec { pname = "guile-cairo"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0yx0844p61ljd4d3d63qrawiygiw6ks02fwv2cqx7nav5kfd8ck2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ guile cairo expat ]; enableParallelBuilding = true; diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix index db16c91c4ef..3521853187c 100644 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/pkgs/development/guile-modules/guile-fibers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, guile, texinfo }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, guile, texinfo }: let version = "1.0.0"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { sha256 = "1r47m1m112kxf23xny99f0qkqsk6626iyc5jp7vzndfiyp5yskwi"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ guile texinfo ]; autoreconfPhase = "./autogen.sh"; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index e1ae323707e..2dc07deac5c 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, guile, guile-lib, gwrap -, pkgconfig, gconf, glib, gnome_vfs, gtk2 +, pkg-config, gconf, glib, gnome_vfs, gtk2 , libglade, libgnome, libgnomecanvas, libgnomeui , pango, guile-cairo, texinfo }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - texinfo guile gwrap pkgconfig gconf glib gnome_vfs gtk2 + texinfo guile gwrap pkg-config gconf glib gnome_vfs gtk2 libglade libgnome libgnomecanvas libgnomeui pango guile-cairo ] ++ lib.optional doCheck guile-lib; diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 6b860bd28da..34299b345ee 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, guile, texinfo, pkgconfig }: +{ lib, stdenv, fetchurl, guile, texinfo, pkg-config }: assert stdenv ? cc && stdenv.cc.isGNU; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { sha256 = "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ guile texinfo ]; doCheck = true; diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index eb10c0f1e59..8f879249a23 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile, ncurses, libffi }: +{ lib, stdenv, fetchurl, pkg-config, guile, ncurses, libffi }: let name = "guile-ncurses-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ guile ncurses libffi ]; preConfigure = '' diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix index f0580477653..effa651b99c 100644 --- a/pkgs/development/guile-modules/guile-opengl/default.nix +++ b/pkgs/development/guile-modules/guile-opengl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile }: +{ lib, stdenv, fetchurl, pkg-config, guile }: let name = "guile-opengl-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { sha256 = "13qfx4xh8baryxqrv986l848ygd0piqwm6s2s90pxk9c0m9vklim"; }; - nativeBuildInputs = [ pkgconfig guile ]; + nativeBuildInputs = [ pkg-config guile ]; meta = with lib; { description = "Guile bindings for the OpenGL graphics API"; diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index ac5358bade9..eaf402a8605 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, pkg-config , gperf, guile, guile-lib, libffi }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gperf guile guile-lib libffi ]; GUILE_SITE="${guile-lib}/share/guile/site"; diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix index a676f65215d..8816e7b4ffc 100644 --- a/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile, buildEnv +{ lib, stdenv, fetchurl, pkg-config, guile, buildEnv , SDL, SDL_image, SDL_ttf, SDL_mixer }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01"; }; - nativeBuildInputs = [ pkgconfig guile ]; + nativeBuildInputs = [ pkg-config guile ]; buildInputs = [ SDL.dev SDL_image SDL_ttf SDL_mixer ]; diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index fe1567272ce..c3f5fdaefbd 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, guile, libtool, pkgconfig +{ lib, stdenv, fetchurl, guile, libtool, pkg-config , SDL2, SDL2_image, SDL2_ttf, SDL2_mixer }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation { sha256 = "118x0cg7fzbsyrfhy5f9ab7dqp9czgia0ycgzp6sn3nlsdrcnr4m"; }; - nativeBuildInputs = [ libtool pkgconfig ]; + nativeBuildInputs = [ libtool pkg-config ]; buildInputs = [ guile SDL2 SDL2_image SDL2_ttf SDL2_mixer ]; diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index d0cc719b625..2de44524425 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile, texinfo }: +{ lib, stdenv, fetchurl, pkg-config, guile, texinfo }: let name = "guile-xcb-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ guile texinfo ]; preConfigure = '' diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 23b9a2735f6..a4674e356cc 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -500,7 +500,7 @@ self: super: builtins.intersectAttrs super { # requires autotools to build secp256k1 = addBuildTools super.secp256k1 [ pkgs.buildPackages.autoconf pkgs.buildPackages.automake pkgs.buildPackages.libtool ]; - # requires libsecp256k1 in pkgconfig-depends + # requires libsecp256k1 in pkg-config-depends secp256k1-haskell = addPkgconfigDepend super.secp256k1-haskell pkgs.secp256k1; # tests require git and zsh diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index e135374511f..bf4f7bd3bbf 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -7,7 +7,7 @@ let isCross = stdenv.buildPlatform != stdenv.hostPlatform; inherit (buildPackages) fetchurl removeReferencesTo - pkgconfig coreutils gnugrep gnused glibcLocales; + pkg-config coreutils gnugrep gnused glibcLocales; in { pname @@ -54,7 +54,7 @@ in , doCoverage ? false , doHaddock ? !(ghc.isHaLVM or false) , passthru ? {} -, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] +, pkg-configDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [], testFrameworkDepends ? [] , benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [], benchmarkFrameworkDepends ? [] , testTarget ? "" @@ -234,7 +234,7 @@ let isHaskellPkg = x: x ? isHaskellLibrary; - allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ + allPkgconfigDepends = pkg-configDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends; depsBuildBuild = [ nativeGhc ]; @@ -243,7 +243,7 @@ let optionals doCheck testToolDepends ++ optionals doBenchmark benchmarkToolDepends; nativeBuildInputs = - [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ + [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkg-config ++ setupHaskellDepends ++ collectedToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends; otherBuildInputsHaskell = @@ -285,7 +285,7 @@ let ''; in stdenv.lib.fix (drv: -assert allPkgconfigDepends != [] -> pkgconfig != null; +assert allPkgconfigDepends != [] -> pkg-config != null; stdenv.mkDerivation ({ name = "${pname}-${version}"; @@ -532,7 +532,7 @@ stdenv.mkDerivation ({ libraryPkgconfigDepends librarySystemDepends libraryToolDepends - pkgconfigDepends + pkg-configDepends setupHaskellDepends ; } // stdenv.lib.optionalAttrs doCheck { @@ -616,7 +616,7 @@ stdenv.mkDerivation ({ depsBuildBuild = stdenv.lib.optional isCross ghcEnvForBuild; nativeBuildInputs = - [ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ + [ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkg-config ++ collectedToolDepends; buildInputs = otherBuildInputsSystem; diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 45c1a8fbd33..8b3020f8861 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -1,4 +1,4 @@ -{ stdenv, ghc, pkgconfig, glibcLocales +{ stdenv, ghc, pkg-config, glibcLocales , cacert, stack, makeSetupHook, lib }@depArgs: { buildInputs ? [] @@ -28,7 +28,7 @@ in stdenv.mkDerivation (args // { ++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales; nativeBuildInputs = nativeBuildInputs - ++ [ ghc pkgconfig stack stackHook ]; + ++ [ ghc pkg-config stack stackHook ]; STACK_PLATFORM_VARIANT = "nix"; STACK_IN_NIX_SHELL = 1; diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 964c179fb65..1537cd6466c 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -160,7 +160,7 @@ rec { addTestToolDepends = drv: xs: overrideCabal drv (drv: { testToolDepends = (drv.testToolDepends or []) ++ xs; }); addPkgconfigDepend = drv: x: addPkgconfigDepends drv [x]; - addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkgconfigDepends = (drv.pkgconfigDepends or []) ++ xs; }); + addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkg-configDepends = (drv.pkg-configDepends or []) ++ xs; }); addSetupDepend = drv: x: addSetupDepends drv [x]; addSetupDepends = drv: xs: overrideCabal drv (drv: { setupHaskellDepends = (drv.setupHaskellDepends or []) ++ xs; }); diff --git a/pkgs/development/idris-modules/glfw.nix b/pkgs/development/idris-modules/glfw.nix index da23ae18331..c63cf8acb0f 100644 --- a/pkgs/development/idris-modules/glfw.nix +++ b/pkgs/development/idris-modules/glfw.nix @@ -10,7 +10,7 @@ build-idris-package { idrisDeps = [ effects ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; extraBuildInputs = [ pkgs.glfw ]; postPatch = '' diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix index 2e1cdaa9be3..943db9e87a0 100644 --- a/pkgs/development/idris-modules/sdl2.nix +++ b/pkgs/development/idris-modules/sdl2.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , effects , lib -, pkgconfig +, pkg-config , SDL2 , SDL2_gfx }: @@ -13,7 +13,7 @@ build-idris-package rec { idrisDeps = [ effects ]; extraBuildInputs = [ - pkgconfig + pkg-config SDL2 SDL2_gfx ]; diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 59abf36f7ac..60a284de3f1 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -1,4 +1,4 @@ -{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc, Security, cmake }: +{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, stdenv, gcc, Security, cmake }: rustPlatform.buildRustPackage rec { pname = "evcxr"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; - nativeBuildInputs = [ pkgconfig makeWrapper cmake ]; + nativeBuildInputs = [ pkg-config makeWrapper cmake ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; postInstall = let wrap = exe: '' diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index 39d4918a70b..9ff81553550 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }: stdenv.mkDerivation { pname = "falcon"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cmake pcre zlib sqlite ]; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index 4a8330f2749..7203ba31993 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -2,7 +2,7 @@ , glib , gtk3 , libffcall -, pkgconfig +, pkg-config , wrapGAppsHook }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cd src ''; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ libffcall glib gtk3 ]; configureOptions = [ "--with-gtk3" ]; diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index 6057480476f..b1c80b13af9 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -1,5 +1,5 @@ { stdenv, pkgsBuildBuild, buildPackages -, fetchurl, makeWrapper, gawk, pkgconfig +, fetchurl, makeWrapper, gawk, pkg-config , libtool, readline, gmp }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_1_8; - nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; + nativeBuildInputs = [ makeWrapper gawk pkg-config ]; buildInputs = [ readline libtool ]; propagatedBuildInputs = [ diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 5b26b38dbd4..1db5676a8c7 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -1,5 +1,5 @@ { stdenv, pkgsBuildBuild, buildPackages -, fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig +, fetchpatch, fetchurl, makeWrapper, gawk, pkg-config , libffi, libtool, readline, gmp, boehmgc, libunistring , coverageAnalysis ? null }: @@ -23,7 +23,7 @@ depsBuildBuild = [ buildPackages.stdenv.cc ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_2_0; - nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; + nativeBuildInputs = [ makeWrapper gawk pkg-config ]; buildInputs = [ readline libtool libunistring libffi ]; propagatedBuildInputs = [ diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 238e1c7b7ad..77483b2256a 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgsBuildBuild, buildPackages -, fetchurl, makeWrapper, gawk, pkgconfig +, fetchurl, makeWrapper, gawk, pkg-config , libffi, libtool, readline, gmp, boehmgc, libunistring , coverageAnalysis ? null , fetchpatch @@ -25,7 +25,7 @@ depsBuildBuild = [ buildPackages.stdenv.cc ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile; - nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; + nativeBuildInputs = [ makeWrapper gawk pkg-config ]; buildInputs = [ readline libtool libunistring libffi ]; propagatedBuildInputs = [ diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 42af3cc427b..a87b3ef8678 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo, ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile, libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl, - python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached + python3, openssl, glfw, pkg-config, libpthreadstubs, libXdmcp, libmemcached }: stdenv.mkDerivation { @@ -21,7 +21,7 @@ stdenv.mkDerivation { zlib sqlite gmp libffi cairo ncurses freetype libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2 freeglut libsamplerate pcre libevent libedit yajl - pkgconfig glfw openssl libpthreadstubs libXdmcp + pkg-config glfw openssl libpthreadstubs libXdmcp libmemcached python3 ]; diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix index bd4b93b835f..180ce28c9ae 100644 --- a/pkgs/development/interpreters/lolcode/default.nix +++ b/pkgs/development/interpreters/lolcode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, doxygen, cmake, readline }: +{ stdenv, fetchurl, pkg-config, doxygen, cmake, readline }: with stdenv.lib; stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1li7ikcrs7wqah7gqkirg0k61n6pm12w7pydin966x1sdn9na46b"; }; - nativeBuildInputs = [ pkgconfig cmake doxygen ]; + nativeBuildInputs = [ pkg-config cmake doxygen ]; buildInputs = [ readline ]; # Maybe it clashes with lci scientific logic software package... diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index dbe3f6fa2df..9319fa12406 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit, +{ stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, libtheora, which, autoconf, automake, libtool }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg libtheora autoconf which libtool automake diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 6f09c076441..2198ff962a1 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkg-config , SDL, libGLU, libGL, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # see discussion on arch linux user repository (https://aur.archlinux.org/packages/love07/?setlang=cs#comment-684696) patches = [ ./0.7-gl-prototypes.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libGLU libGL openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index 3a6c385ee5f..866ce83adf1 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkg-config , SDL, libGLU, libGL, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libGLU libGL openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index 79b83f0643f..315a07bd9ca 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkg-config , SDL2, libGLU, libGL, openal, luajit , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1pikd0bzb44r4bf0jbgn78whz1yswpq1n5jc8nf87v42pm30kp84"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix index 2ef3a4ca05a..48ac142934b 100644 --- a/pkgs/development/interpreters/love/11.1.nix +++ b/pkgs/development/interpreters/love/11.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit, +{ stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, libtheora, which, autoconf, automake, libtool }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "18gfp65ngb8k8g7hgbw2bhrwk2i7m56m21d39pk4484q9z8p4vm7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg libtheora autoconf which libtool automake diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix index 8d5a0252944..0441e48685e 100644 --- a/pkgs/development/interpreters/micropython/default.nix +++ b/pkgs/development/interpreters/micropython/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, libffi, python3, readline }: +{ stdenv, lib, fetchFromGitHub, pkg-config, libffi, python3, readline }: stdenv.mkDerivation rec { pname = "micropython"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libffi readline ]; diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 0c976f2f0b0..de829c14c98 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nix, git }: let +{ stdenv, fetchurl, pkg-config, nix, git }: let version = "4.1.6"; in stdenv.mkDerivation { pname = "nix-exec"; @@ -9,7 +9,7 @@ in stdenv.mkDerivation { sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ nix git ]; NIX_CFLAGS_COMPILE = "-std=c++1y"; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 67fca52dad5..7dedf79c340 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -14,7 +14,7 @@ , libX11 , graphicsmagick , pcre -, pkgconfig +, pkg-config , libGL , libGLU , fltk @@ -145,7 +145,7 @@ in mkDerivation rec { ] ; nativeBuildInputs = [ - pkgconfig + pkg-config gfortran # Listed here as well because it's outputs are split fftw diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 82134e14406..2389b56bd6f 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -7,7 +7,7 @@ let generic = { callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool - , pkgconfig, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 + , pkg-config, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 , systemd, system-sendmail, valgrind, xcbuild , version @@ -149,7 +149,7 @@ let enableParallelBuilding = true; - nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ] + nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ] ++ lib.optional stdenv.isDarwin xcbuild; buildInputs = diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index 9b57e153aa0..02f561c004e 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkgconfig, gcc, +{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc, pypy, libffi, libedit, libuv, boost, zlib, variant ? "jit", buildWithPypy ? false }: @@ -32,7 +32,7 @@ let build = {flags, target}: stdenv.mkDerivation rec { pname = "pixie"; version = "0-r${commit-count}-${variant}"; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = libs; PYTHON = if buildWithPypy then "${pypy}/pypy-c/pypy-c" diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 8feeb3c51bf..9c6457d22aa 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,5 +1,5 @@ { stdenv, substituteAll, fetchurl -, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi, libunwind, Security +, zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security , sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 , self, gdbm, db, lzma , python-setup-hook @@ -49,7 +49,7 @@ in with passthru; stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db ] ++ optionals isPy3k [ diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix index 1762edbbdb7..4ce4db5aca1 100644 --- a/pkgs/development/interpreters/qnial/default.nix +++ b/pkgs/development/interpreters/qnial/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses }: +{ stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses }: stdenv.mkDerivation { pname = "qnial"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { buildInputs = [ unzip - pkgconfig + pkg-config ncurses ]; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 41cf4c221c6..3768751efdc 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, pkgconfig, SDL2 +{ stdenv, fetchurl, python2Packages, pkg-config, SDL2 , libpng, ffmpeg_3, freetype, glew, libGL, libGLU, fribidi, zlib , glib }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { substituteInPlace launcher/game/choose_directory.rpy --replace /usr/bin/python ${python.interpreter} ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python cython wrapPython tkinter SDL2 libpng ffmpeg_3 freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 37efeba3f9b..0588d564b1c 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }: +{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkg-config, nspr, perl, python2, zip }: stdenv.mkDerivation { pname = "spidermonkey"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ nspr ]; - nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isAarch32 autoconf213; + nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isAarch32 autoconf213; buildInputs = [ perl python2 zip ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix index 22ce5a0b387..2a527eb8640 100644 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages +{ stdenv, fetchurl, pkg-config, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages , libobjc }: with stdenv.lib; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libffi readline icu zlib ] ++ stdenv.lib.optional stdenv.isDarwin libobjc; - nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ]; + nativeBuildInputs = [ pkg-config perl python2 zip gnused_422 ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix index 42731421d81..4bb6c815b2d 100644 --- a/pkgs/development/interpreters/spidermonkey/60.nix +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, buildPackages +{ stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, zip, buildPackages , which, readline, zlib, icu }: with stdenv.lib; @@ -18,7 +18,7 @@ in stdenv.mkDerivation { setOutputFlags = false; # Configure script only understands --includedir buildInputs = [ readline zlib icu ]; - nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; + nativeBuildInputs = [ autoconf213 pkg-config perl which python2 zip ]; patches = [ # Fixed in 62.0 diff --git a/pkgs/development/interpreters/spidermonkey/68.nix b/pkgs/development/interpreters/spidermonkey/68.nix index 36d28f62e2e..bb577be4cd7 100644 --- a/pkgs/development/interpreters/spidermonkey/68.nix +++ b/pkgs/development/interpreters/spidermonkey/68.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, python3, zip, buildPackages +{ stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages , which, readline, zlib, icu, cargo, rustc, llvmPackages }: with stdenv.lib; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf213 - pkgconfig + pkg-config perl which python2 diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix index a3d7242f453..e7f63870181 100644 --- a/pkgs/development/interpreters/spidermonkey/78.nix +++ b/pkgs/development/interpreters/spidermonkey/78.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , autoconf213 -, pkgconfig +, pkg-config , perl , python3 , zip @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargo llvmPackages.llvm # for llvm-objdump perl - pkgconfig + pkg-config python3 rust-cbindgen rustc diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 113eb54a00b..df873937b4f 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, alsaLib +{ stdenv, fetchurl, cmake, pkg-config, alsaLib , libjack2, libsndfile, fftw, curl, gcc , libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "-DSC_EL=${if useSCEL then "ON" else "OFF"}" ]; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 61609a90dd0..e13c94bcb6e 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv +{ stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL, libGLU , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; outputBin = "dev"; # sdl-config - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ optional stdenv.isLinux libcap; propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 31624bee2fb..1fa021feb85 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, fetchurl, pkgconfig +{ stdenv, config, fetchurl, pkg-config , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { --replace 'WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`' 'WAYLAND_SCANNER=`pkg-config --variable=wayland_scanner wayland-scanner`' ''; - depsBuildBuild = [ pkgconfig ]; + depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ pkgconfig ] ++ optionals waylandSupport [ wayland ]; + nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland ]; propagatedBuildInputs = dlopenPropagatedBuildInputs; diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix index 9340b9f7091..56ffbfe34d2 100644 --- a/pkgs/development/libraries/SDL_Pango/default.nix +++ b/pkgs/development/libraries/SDL_Pango/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkgconfig }: +{ stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkg-config }: stdenv.mkDerivation rec { pname = "SDL_Pango"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preConfigure = "autoreconf -i -f"; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ SDL pango ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix index 8d37124d311..a1e4dda6878 100644 --- a/pkgs/development/libraries/SDL_sixel/default.nix +++ b/pkgs/development/libraries/SDL_sixel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libsixel }: +{ stdenv, fetchFromGitHub, pkg-config, libsixel }: stdenv.mkDerivation { pname = "SDL_sixel"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { configureFlags = [ "--enable-video-sixel" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsixel ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index d26a910638e..10d954397ff 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, imake, gccmakedep, bison, flex, pkgconfig +, imake, gccmakedep, bison, flex, pkg-config , xlibsWrapper, libXmu, libXpm, libXp }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; dontUseImakeConfigure = true; - nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ]; + nativeBuildInputs = [ pkg-config bison flex imake gccmakedep ]; buildInputs = [ libXpm libXp ]; propagatedBuildInputs = [ xlibsWrapper libXmu ]; diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 4e2e33b852e..dcfe4a4ef27 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qmake }: +{ mkDerivation, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake }: mkDerivation rec { pname = "accounts-qt"; @@ -12,7 +12,7 @@ mkDerivation rec { }; propagatedBuildInputs = [ glib libaccounts-glib ]; - nativeBuildInputs = [ doxygen pkgconfig qmake ]; + nativeBuildInputs = [ doxygen pkg-config qmake ]; # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 6bd76c62b97..362605d1050 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , substituteAll -, pkgconfig +, pkg-config , glib , shadow , gobject-introspection @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config python3 ]; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 49c8e14a74f..0fe777b7b2b 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libtool, perl }: +{ stdenv, fetchurl, pkg-config, libtool, perl }: stdenv.mkDerivation rec { pname = "ace"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig libtool ]; + nativeBuildInputs = [ pkg-config libtool ]; buildInputs = [ perl ]; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index d65ff369064..2b083a47a20 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig +{ stdenv, fetchurl, autoconf, automake, libtool, pkg-config , freetype, SDL, libX11 }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "http://www.antigrain.com/${name}.tar.gz"; sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool freetype SDL libX11 ]; postPatch = '' diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index fd612170910..20175486b16 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -3,7 +3,7 @@ , libXxf86dga, libXxf86misc , libXxf86vm, openal, libGLU, libGL, libjpeg, flac , libXi, libXfixes, freetype, libopus, libtheora -, physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs +, physfs, enet, pkg-config, gtk2, pcre, libpulseaudio, libpthreadstubs , libXdmcp }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libXxf86vm openal libGLU libGL libjpeg flac libXi libXfixes - enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp + enet libtheora freetype physfs libopus pkg-config gtk2 pcre libXdmcp libpulseaudio libpthreadstubs ]; diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index f6859c94364..b4731b608dc 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -5,7 +5,7 @@ , ninja , patchelf , perl -, pkgconfig +, pkg-config , python3 , expat , libdrm @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { ninja patchelf perl - pkgconfig + pkg-config python3 ]; diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index e514b8b5c31..300069e60ae 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , gtk3 -, pkgconfig +, pkg-config , gobject-introspection , gnome3 , dbus @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config dbus gobject-introspection ]; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 8e77f6aa34e..a5b4c0cad48 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -19,7 +19,7 @@ , libxslt , meson , ninja -, pkgconfig +, pkg-config , pngquant }: stdenv.mkDerivation rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 820e7383246..3764d1e7f86 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gettext +{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, gettext , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection , pcre, itstool, gperf, vala, lmdb, libsoup @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gettext + meson ninja pkg-config gettext libxslt xmlto docbook_xsl docbook_xml_dtd_45 gobject-introspection itstool vala ]; diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 37bc175fede..ab5ff960e98 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gmp, gwenhywfar, libtool, libxml2, libxslt -, pkgconfig, gettext, xmlsec, zlib +, pkg-config, gettext, xmlsec, zlib }: let @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { buildInputs = [ gmp gwenhywfar libtool libxml2 libxslt xmlsec zlib ]; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; meta = with stdenv.lib; { description = "An interface to banking tasks, file formats and country information"; diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 4c5192574d8..660f3bf377e 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkgconfig, gettext +{ stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkg-config, gettext , which # GUI support @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { configure ''; - nativeBuildInputs = [ pkgconfig gettext which ]; + nativeBuildInputs = [ pkg-config gettext which ]; buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpgerror ]; diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix index 0e01480a4bd..c4cf069b04c 100644 --- a/pkgs/development/libraries/aqbanking/libchipcard.nix +++ b/pkgs/development/libraries/aqbanking/libchipcard.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gwenhywfar, pcsclite, zlib }: +{ stdenv, fetchurl, pkg-config, gwenhywfar, pcsclite, zlib }: let inherit ((import ./sources.nix).libchipcard) sha256 releaseId version; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gwenhywfar pcsclite zlib ]; diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index 40a96553fbe..89c8d91f26a 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, intltool +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool , audit, glib, libusb1, libxml2 , wrapGAppsHook , gstreamer ? null @@ -46,7 +46,7 @@ in nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config intltool gtk-doc ] ++ stdenv.lib.optional enableViewer wrapGAppsHook; diff --git a/pkgs/development/libraries/aribb25/default.nix b/pkgs/development/libraries/aribb25/default.nix index ceae8698545..949fd401f5d 100644 --- a/pkgs/development/libraries/aribb25/default.nix +++ b/pkgs/development/libraries/aribb25/default.nix @@ -3,7 +3,7 @@ , fetchFromGitLab , fetchpatch , autoreconfHook -, pkgconfig +, pkg-config , pcsclite , PCSC , xcbuild @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ] ++ lib.optional stdenv.isDarwin xcbuild; buildInputs = if stdenv.isDarwin then [ PCSC ] else [ pcsclite ]; diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index 3e678c8544e..c9a09ac115c 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config , opencl-clhpp, ocl-icd, fftw, fftwFloat , blas, lapack, boost, mesa, libGLU, libGL , freeimage, python, clfft, clblas @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config python ]; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 04f8c266131..c638c4b2a40 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -3,7 +3,7 @@ , meson , ninja -, pkgconfig +, pkg-config , at-spi2-core , atk @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "z6AIpa+CKzauYofxgYLEDJHdaZxV+qOGBYge0XXKRk8="; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ at-spi2-core atk dbus glib libxml2 ]; doCheck = false; # fails with "No test data file provided" diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index ba77020ec70..2d3e96639c7 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -3,7 +3,7 @@ , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , gsettings-desktop-schemas , makeWrapper @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection makeWrapper ]; buildInputs = [ libX11 libXtst libXi ]; # In atspi-2.pc dbus-1 glib-2.0 propagatedBuildInputs = [ dbus glib ]; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index aa132515b3e..e962eac0092 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib +{ stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib , fixDarwinDylibNames, gobject-introspection, gnome3 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ] + nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index cc45dc5a8d8..1e6f047b6aa 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, atk, glibmm, pkgconfig, gnome3 }: +{ stdenv, fetchurl, atk, glibmm, pkg-config, gnome3 }: stdenv.mkDerivation rec { pname = "atkmm"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ atk glibmm ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; doCheck = true; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index bd1d86520c0..0760a1438c0 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate -, libsndfile, pkgconfig, python, wafHook +, libsndfile, pkg-config, python, wafHook }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl"; }; - nativeBuildInputs = [ pkgconfig python wafHook ]; + nativeBuildInputs = [ pkg-config python wafHook ]; buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix index bc98dab4ab6..24f4c77e350 100644 --- a/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsndfile }: +{ stdenv, fetchurl, pkg-config, libsndfile }: stdenv.mkDerivation rec { pname = "libbs2b"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index d521b7e76ab..a3d76e55e36 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, glib, pkgconfig }: +{ stdenv, fetchurl, autoreconfHook, glib, pkg-config }: stdenv.mkDerivation rec { version = "1.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index e8008058626..1e126654bba 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lv2, pkgconfig, python3, serd, sord, sratom, wafHook }: +{ stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook }: stdenv.mkDerivation rec { pname = "lilv"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./lilv-pkgconfig.patch ]; - nativeBuildInputs = [ pkgconfig python3 wafHook ]; + nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index dac98584646..3005a4398f9 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python3, wafHook }: +{ stdenv, fetchurl, gtk2, libsndfile, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "lv2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0gs7401xz23q9vajqr31aa2db8dvssgyh5zrvr4ipa6wig7yb8wh"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ gtk2 libsndfile python3 ]; wafConfigureFlags = stdenv.lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ]; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index 6bc487e2616..e497816bf1c 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python, wafHook }: +{ stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python, wafHook }: stdenv.mkDerivation rec { pname = "lvtk"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd"; }; - nativeBuildInputs = [ pkgconfig python wafHook ]; + nativeBuildInputs = [ pkg-config python wafHook ]; buildInputs = [ boost gtkmm2 lv2 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index f039e574d54..e2f20d46a3d 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2, wafHook }: +{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python2, wafHook }: stdenv.mkDerivation rec { pname = "ntk"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ cairo libjpeg libXft python2 ]; diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index 8acd6d3c666..1516b6df879 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, boost, gtk2, pkgconfig, python, wafHook }: +{ stdenv, fetchgit, boost, gtk2, pkg-config, python, wafHook }: stdenv.mkDerivation rec { pname = "raul"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ boost gtk2 python ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index d30b1ce6c64..33a400c2f3d 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkgconfig }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkg-config }: stdenv.mkDerivation rec { version = "4.0.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool libjack2 alsaLib ]; preConfigure = '' diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index cec50290d09..392c05c02a7 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lv2, pkgconfig, python3, serd, sord, wafHook }: +{ stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, wafHook }: stdenv.mkDerivation rec { pname = "sratom"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l"; }; - nativeBuildInputs = [ pkgconfig wafHook python3 ]; + nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ lv2 serd sord ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index c2496840b7d..43e5bc8f9cc 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom +{ stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python, serd, sord, sratom , wafHook , withQt4 ? true, qt4 ? null , withQt5 ? false, qt5 ? null }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ gtk2 lv2 python serd sord sratom ] ++ (lib.optionals withQt4 [ qt4 ]) ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix index 0e49a626512..9c0a138b309 100644 --- a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix +++ b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix @@ -1,7 +1,7 @@ # set VAMP_PATH ? # plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses) -{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }: +{ stdenv, fetchFromGitHub, pkg-config, libsndfile }: stdenv.mkDerivation rec { pname = "vamp-plugin-sdk"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1lhmskcyk7qqfikmasiw7wjry74gc8g5q6a3j1iya84yd7ll0cz6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index a560cc39d16..ca832816eab 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages +{ fetchurl, fetchpatch, stdenv, pkg-config, libdaemon, dbus, perlPackages , expat, gettext, intltool, glib, libiconv, writeShellScriptBin, libevent , gtk3Support ? false, gtk3 ? null , qt4 ? null @@ -13,7 +13,7 @@ assert qt4Support -> qt4 != null; let # despite the configure script claiming it supports $PKG_CONFIG, it doesnt respect it - pkgconfig-helper = writeShellScriptBin "pkg-config" ''exec $PKG_CONFIG "$@"''; + pkg-config-helper = writeShellScriptBin "pkg-config" ''exec $PKG_CONFIG "$@"''; in stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]); - nativeBuildInputs = [ pkgconfig pkgconfig-helper gettext intltool glib ]; + nativeBuildInputs = [ pkg-config pkg-config-helper gettext intltool glib ]; configureFlags = [ "--disable-qt3" "--disable-gdbm" "--disable-mono" diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 99f8d7f8497..b0dfd52ab16 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchurl, pkgconfig, jansson, zlib }: +{ stdenv, cmake, fetchurl, pkg-config, jansson, zlib }: let version = "1.9.1"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation { patchShebangs . ''; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ jansson zlib ]; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 9bb6e9e1c5e..3352a14eaa3 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , lcms2 , vala @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gobject-introspection vala ]; diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index d8041304856..e7d8daf4d28 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -10,7 +10,7 @@ , libwnck3 , glib , vala -, pkgconfig +, pkg-config , libstartup_notification , gobject-introspection , gtk-doc @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { gobject-introspection gtk-doc libtool - pkgconfig + pkg-config vala which wrapGAppsHook diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 5273ef0c568..29618623bbf 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , clang-unwrapped , llvm , libdrm @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config python3 ]; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 - pkgconfig + pkg-config makeWrapper ]; diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix index 27c6637d9fe..39591a3a05f 100644 --- a/pkgs/development/libraries/biblesync/default.nix +++ b/pkgs/development/libraries/biblesync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, libuuid }: +{ stdenv, fetchFromGitHub, pkg-config, cmake, libuuid }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libuuid ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix index 31997e58577..cb2b24f580b 100644 --- a/pkgs/development/libraries/boehm-gc/7.6.6.nix +++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libatomic_ops , enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libatomic_ops ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" "doc" ]; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index 9ec27d3e9eb..a056ece56e9 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig }: +{ stdenv, fetchurl, pkg-config }: let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "10qynbyw723gz2vrvn4xk2var172kvhlz3l3l80qbdsfb3d12wn0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = { description = "Library for operations on boolean expression binary trees"; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 3a7c63165b7..2eedfbb7b0e 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv +{ config, stdenv, fetchurl, fetchpatch, pkg-config, libiconv , libintl, expat, zlib, libpng, pixman, fontconfig, freetype , x11Support? !stdenv.isDarwin, libXext, libXrender , gobjectSupport ? true, glib @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { outputBin = "dev"; # very small nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 13550bf3fab..cbf9eedc8d5 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, darwin, cairo, fontconfig, freetype, libsigcxx }: +{ fetchurl, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx }: stdenv.mkDerivation rec { pname = "cairomm"; version = "1.12.2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ cairo libsigcxx ]; buildInputs = [ fontconfig freetype ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 5140205ebc8..b9cf52d62ed 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig }: +{ stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { pname = "capstone"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { + "PREFIX=$out ./make.sh install"; nativeBuildInputs = [ - pkgconfig + pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index dba16b19e3b..7813e53a41e 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ucommon, openssl, libgcrypt }: +{ stdenv, fetchurl, pkg-config, ucommon, openssl, libgcrypt }: stdenv.mkDerivation rec { name = "ccrtp-2.1.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17ili8l7zqbbkzr1rcy4hlnazkf50mds41wg6n7bfdsx3c7cldgh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ ucommon openssl libgcrypt ]; configureFlags = [ diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 1a9644991b6..82338818918 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }: +{ fetchurl, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "clutter-gst"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ clutter gtk3 glib cogl gdk-pixbuf ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; postBuild = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 973ae344dc9..15bf0d689f5 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, meson, ninja +{ fetchurl, stdenv, pkg-config, meson, ninja , gobject-introspection, clutter, gtk3, gnome3 }: let @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; propagatedBuildInputs = [ clutter gtk3 ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ]; postBuild = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 8a70a872b9e..8644f83a689 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGLU, libGL, libX11, libXext, libXfixes +{ stdenv, fetchurl, pkg-config, libGLU, libGL, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib , gobject-introspection, gtk3, gnome3, libinput, libgudev, libxkbcommon }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ gtk3 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libX11 libGL libGLU libXext libXfixes libXdamage libXcomposite libXi cogl pango atk json-glib gobject-introspection libxcb libinput libgudev libxkbcommon diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix index 512a289152a..a391f604875 100644 --- a/pkgs/development/libraries/cmrt/default.nix +++ b/pkgs/development/libraries/cmrt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libdrm, libva }: +{ stdenv, fetchurl, autoreconfHook, pkg-config, libdrm, libva }: stdenv.mkDerivation rec { pname = "cmrt"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1q7651nvvcqhph5rgfhklm71zqd0c405mrh3wx0cfzvil82yj8na"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libdrm libva ]; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index f2a69e87d85..10f732dc629 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk-pixbuf, xorg, libintl +{ stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl , pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3 , mesa, automake, autoconf , gstreamerSupport ? true, gst_all_1 }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig libintl automake autoconf ]; + nativeBuildInputs = [ pkg-config libintl automake autoconf ]; configureFlags = [ "--enable-introspection" diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix index fa4f5d232aa..df1837de305 100644 --- a/pkgs/development/libraries/cre2/default.nix +++ b/pkgs/development/libraries/cre2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, - libtool, pkgconfig, re2, texinfo }: + libtool, pkg-config, re2, texinfo }: stdenv.mkDerivation rec { pname = "cre2"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libtool - pkgconfig + pkg-config ]; buildInputs = [ re2 texinfo ]; diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix index 71e30104476..7ca90281abb 100644 --- a/pkgs/development/libraries/ctl/default.nix +++ b/pkgs/development/libraries/ctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, ilmbase, libtiff, openexr }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ilmbase, libtiff, openexr }: stdenv.mkDerivation rec { pname = "ctl"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libtiff ilmbase openexr ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index 077ac63748c..7c78faaee0b 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib }: +{ stdenv, fetchurl, pkg-config, glib }: stdenv.mkDerivation rec { pname = "ctpl"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1yr92xv9n6kgyixwg9ps4zb404ic5pgb171k4bi3mv9p6k8gv59s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/ctypes_sh/default.nix b/pkgs/development/libraries/ctypes_sh/default.nix index d82296c3e66..6ec2a694970 100644 --- a/pkgs/development/libraries/ctypes_sh/default.nix +++ b/pkgs/development/libraries/ctypes_sh/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchFromGitHub -, autoreconfHook, pkgconfig +, autoreconfHook, pkg-config , zlib, libffi, elfutils, libdwarf }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1wafyfhwd7nf7xdici0djpwgykizaz7jlarn0r1b4spnpjx1zbx4"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ zlib libffi elfutils libdwarf ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 9f12da6b0ed..80ec1986f8c 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook , qtbase, libuuid, libcap, uwsgi, grantlee, pcre }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-RidUZqDnzRrgW/7LVF+BF01zNcf1cJ/kS7OF/t1Q65c="; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase libuuid libcap uwsgi grantlee pcre ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index 353a5ba9061..a19b1a2d9d0 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkgconfig, gtk2 }: +{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "cwiid-${version}-git"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison flex bluez gtk2 ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; NIX_LDFLAGS = "-lbluetooth"; diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 4be942d8b69..b78df35190b 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab -, meson, ninja, nasm, pkgconfig +, meson, ninja, nasm, pkg-config , withTools ? false # "dav1d" binary , withExamples ? false, SDL2 # "dav1dplay" binary , useVulkan ? false, libplacebo, vulkan-loader, vulkan-headers @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1820fpmmq1vxjzjmza6ydk4fgxipb8gmcc5skybki64qn7410v7x"; }; - nativeBuildInputs = [ meson ninja nasm pkgconfig ]; + nativeBuildInputs = [ meson ninja nasm pkg-config ]; # TODO: doxygen (currently only HTML and not build by default). buildInputs = stdenv.lib.optional withExamples SDL2 ++ stdenv.lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ]; diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 1c9f7131172..68b4efb377b 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus, glib, pkgconfig, expat }: +{ stdenv, fetchurl, dbus, glib, pkg-config, expat }: stdenv.mkDerivation rec { pname = "dbus-cplusplus"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus glib expat ]; configureFlags = [ "--disable-ecore" "--disable-tests" ]; diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index b0dd8e91960..8fb06fe9c44 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPackages -, pkgconfig, expat, gettext, libiconv, dbus, glib +, pkg-config, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - nativeBuildInputs = [ pkgconfig gettext glib ]; + nativeBuildInputs = [ pkg-config gettext glib ]; buildInputs = [ expat libiconv ]; diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix index 22c0a9137ca..77cbd6e28ca 100644 --- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, dbus-sharp-1_0 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono, dbus-sharp-1_0 }: stdenv.mkDerivation rec { pname = "dbus-sharp-glib"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0z8ylzby8n5sar7aywc8rngd9ap5qqznadsscp5v34cacdfz1gxm"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ mono dbus-sharp-1_0 ]; dontStrip = true; diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix index 496a109b58f..33f0c6b382e 100644 --- a/pkgs/development/libraries/dbus-sharp-glib/default.nix +++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, mono, dbus-sharp-2_0, autoreconfHook }: +{ stdenv, fetchFromGitHub, pkg-config, mono, dbus-sharp-2_0, autoreconfHook }: stdenv.mkDerivation rec { pname = "dbus-sharp-glib"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0i39kfg731as6j0hlmasgj8dyw5xsak7rl2dlimi1naphhffwzm8"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ mono dbus-sharp-2_0 ]; dontStrip = true; diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix index 084beae5972..291bb56efde 100644 --- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }: +{stdenv, fetchFromGitHub, pkg-config, mono, autoreconfHook }: stdenv.mkDerivation rec { pname = "dbus-sharp"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "13qlqx9wqahfpzzl59157cjxprqcx2bd40w5gb2bs3vdx058p562"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ mono ]; dontStrip = true; diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix index 0fd638dbf8e..86a4fce00aa 100644 --- a/pkgs/development/libraries/dbus-sharp/default.nix +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, mono4, autoreconfHook }: +{stdenv, fetchFromGitHub, pkg-config, mono4, autoreconfHook }: stdenv.mkDerivation rec { pname = "dbus-sharp"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1g5lblrvkd0wnhfzp326by6n3a9mj2bj7a7646g0ziwgsxp5w6y7"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged # See: https://github.com/NixOS/nixpkgs/pull/46060 diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 4480d197fa7..4496e59a407 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchurl -, pkgconfig +, pkg-config , expat , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl , systemd @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" "doc" "man" ]; nativeBuildInputs = [ - pkgconfig + pkg-config docbook_xml_dtd_44 docbook-xsl-nons xmlto diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index 594cac5002f..fdbe8783d02 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchgit , fetchpatch -, pkgconfig +, pkg-config , glib , icu , gobject-introspection @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config vala autoreconfHook gobject-introspection diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index d333b786665..1b0b50d28f0 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchpatch -, autoreconfHook, perl, pkgconfig, flux, zlib +, autoreconfHook, perl, pkg-config, flux, zlib , libjpeg, freetype, libpng, giflib , enableX11 ? true, xorg , enableSDL ? true, SDL }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook perl pkgconfig flux ]; + nativeBuildInputs = [ autoreconfHook perl pkg-config flux ]; buildInputs = [ zlib libjpeg freetype giflib libpng ] ++ lib.optional enableSDL SDL diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix index ff81ab72732..6570b48e163 100644 --- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dbus, dleyna-core, glib }: +{ stdenv, autoreconfHook, pkg-config, fetchFromGitHub, dbus, dleyna-core, glib }: stdenv.mkDerivation rec { pname = "dleyna-connector-dbus"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0vziq5gwjm79yl2swch2mz6ias20nvfddf5cqgk9zbg25cb9m117"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ dbus dleyna-core glib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix index 1f0a9bc7c59..56d40361334 100644 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ b/pkgs/development/libraries/dleyna-core/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , fetchpatch , autoreconfHook -, pkgconfig +, pkg-config , gupnp }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index 6b14bbc611a..8bff782bacc 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , dleyna-connector-dbus , dleyna-core , gssdp @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config makeWrapper ]; diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index 90c4df8e641..4e6d263ed18 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -3,7 +3,7 @@ , fetchpatch , autoreconfHook , makeWrapper -, pkgconfig +, pkg-config , dleyna-core , dleyna-connector-dbus , gssdp @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config makeWrapper ]; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index c4d441df5a9..0f0b9720a1a 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, libpng, libjpeg +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libpng, libjpeg , guiSupport ? false, libX11 # see http://dlib.net/compile.html @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}" "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libpng libjpeg ] ++ lib.optional guiSupport libX11; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 49435ec6718..5c9454d3228 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file, libco-canonical +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libco-canonical , libuv, raft-canonical, sqlite-replication }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0h7ypigj1b6xbspzc35y89jkp84v8rqiv9qgkyqlqylr7mcw952a"; }; - nativeBuildInputs = [ autoreconfHook file pkgconfig ]; + nativeBuildInputs = [ autoreconfHook file pkg-config ]; buildInputs = [ libco-canonical.dev libuv diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index 779e6b07762..cfb0f31af04 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM -, libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkgconfig +, libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkg-config }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ ladspaH libjack2 liblo alsaLib qt4 libX11 libsndfile libSM - libsamplerate libtool autoconf automake xorgproto libICE pkgconfig + libsamplerate libtool autoconf automake xorgproto libICE pkg-config ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index f0f96273bea..1eb23c1145b 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp -pr *.so* $out/lib install -d -m 0755 $out/include/dxflib cp -pr src/*.h $out/include/dxflib - # Generate pkgconfig file + # Generate pkg-config file install -d -m 0755 $out/lib/pkgconfig cat << 'EOF' > $out/lib/pkgconfig/dxflib.pc prefix=${placeholder "out"} diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index 1509db1b80d..be22e24044d 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , meson , ninja , libX11 @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix index 1fbe6f8893b..9f340545584 100644 --- a/pkgs/development/libraries/elementary-cmake-modules/default.nix +++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig }: +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation { pname = "elementary-cmake-modules"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { --replace ' ''${CMAKE_ROOT}/Modules' " $out/lib/cmake" ''; - propagatedBuildInputs = [ cmake pkgconfig ]; + propagatedBuildInputs = [ cmake pkg-config ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index 650c1d4ce49..fad14a898a7 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw, +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw, openimageio, libjpeg, libpng, libpthreadstubs, libX11, glib }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; - nativeBuildInputs = [ ispc pkgconfig cmake ]; + nativeBuildInputs = [ ispc pkg-config cmake ]; buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ] ++ lib.optionals stdenv.isDarwin [ glib ]; diff --git a/pkgs/development/libraries/enchant/1.x.nix b/pkgs/development/libraries/enchant/1.x.nix index 0b7b4c9c8b1..671ebb279fa 100644 --- a/pkgs/development/libraries/enchant/1.x.nix +++ b/pkgs/development/libraries/enchant/1.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }: +{ stdenv, fetchurl, aspell, pkg-config, glib, hunspell, hspell }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ aspell glib hunspell hspell ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index 15e634fe4b5..7cc7a24f2c8 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python3 +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, utilmacros, python3 , libGL, libX11 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python3 ]; + nativeBuildInputs = [ autoreconfHook pkg-config utilmacros python3 ]; buildInputs = [ libGL libX11 ]; preConfigure = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index 4968c38bfd3..9f9adb455b9 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libosip, openssl, pkgconfig, fetchpatch }: +{ stdenv, fetchurl, libosip, openssl, pkg-config, fetchpatch }: stdenv.mkDerivation rec { pname = "libexosip2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "17cna8kpc8nk1si419vgr6r42k2lda0rdk50vlxrw8rzg0xp2xrw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libosip openssl ]; patches = [ diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 0ce0f56d710..c49c12c03bd 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , libnice -, pkgconfig +, pkg-config , autoreconfHook , gstreamer , gst-plugins-base @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook gobject-introspection ]; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index decea9bfb79..d62d3dd7cc6 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas, lapack +{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkg-config, blas, lapack , gmpxx }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ] ++ stdenv.lib.optionals doCheck checkInputs; buildInputs = [ givaro blas lapack ]; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index f428290e803..27f2c65e867 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm +{ stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkg-config, perl, texinfo, yasm /* * Licensing options (yes some are listed twice, filters and such are not listed) */ @@ -430,7 +430,7 @@ stdenv.mkDerivation rec { "--enable-cross-compile" ]; - nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; + nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ]; buildInputs = [ bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix index 049ef32b72f..d01f22c0b3a 100644 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libsixel, yasm +{ stdenv, fetchFromGitHub, pkg-config, libsixel, yasm }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "00s2lggfdj2ibpngpyqqg7360p7yb69ys1ppg59yvv0m0mxk5x3k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsixel yasm diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index d763fb51354..bc4de6a5b4a 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, pkgconfig, addOpenGLRunpath, perl, texinfo, yasm +{ stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d @@ -167,7 +167,7 @@ stdenv.mkDerivation rec { ] ++ optional stdenv.cc.isClang "--cc=clang"); depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; + nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ]; buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index ebbced19eb8..3dfe697981c 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkgconfig }: +{ stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkg-config }: stdenv.mkDerivation rec { pname = "ffms"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fPIC"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ffmpeg_3 ]; # ffms includes a built-in vapoursynth plugin, see: diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index c40a75edc09..4c482176fcb 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi +{ stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi , freeglut, libGLU, libGL, libjpeg, zlib, libXft, libpng , libtiff, freetype, Cocoa, AGL, GLUT }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ] ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index ad4736533cf..ca8198fb271 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi +{ stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi , freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng , libtiff, freetype, Cocoa, AGL, GLUT }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ] ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 6181cb45e19..7b2ca83fe5b 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -1,6 +1,6 @@ { fetchurl , stdenv -, pkgconfig +, pkg-config , meson , ninja , glib @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 meson ninja - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/development/libraries/forge/default.nix b/pkgs/development/libraries/forge/default.nix index 83630aef9aa..aec790dd843 100644 --- a/pkgs/development/libraries/forge/default.nix +++ b/pkgs/development/libraries/forge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkg-config , arrayfire, expat, fontconfig, freeimage, freetype, boost , mesa, libGLU, libGL, glfw3, SDL2, cudatoolkit }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index f266f07a631..30a97b01528 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true -, stdenv, fetchurl, pkgconfig, xorg }: +, stdenv, fetchurl, pkg-config, xorg }: stdenv.mkDerivation rec { pname = "frame"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - stdenv pkgconfig + stdenv pkg-config ] ++ stdenv.lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi]; configureFlags = stdenv.lib.optional enableX11 "--with-x11"; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 9021e78a5b6..2cf02651473 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu +{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkg-config, freeglut, libGLU, libGL, libXi, libXmu , GLUT, Cocoa }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ] ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = { description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS"; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 1dc9633d1a7..df26ac9978d 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig +{ stdenv, fetchurl, autoreconfHook, pkg-config , openssl , odbcSupport ? true, unixODBC ? null }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { openssl ] ++ stdenv.lib.optional odbcSupport unixODBC; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with stdenv.lib; { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index b87e64c2afb..4e4db4b844e 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , buildPackages -, pkgconfig, which, makeWrapper +, pkg-config, which, makeWrapper , zlib, bzip2, libpng, gnumake, glib , # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkgconfig which makeWrapper ] + nativeBuildInputs = [ pkg-config which makeWrapper ] # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ optional (!stdenv.isLinux) gnumake; @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { postInstall = glib.flattenInclude + '' substituteInPlace $dev/bin/freetype-config \ - --replace ${buildPackages.pkgconfig} ${pkgconfig} + --replace ${buildPackages.pkg-config} ${pkg-config} wrapProgram "$dev/bin/freetype-config" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index 2dc7275559d..8a059041998 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, cairo, opencv, pkgconfig }: +{ stdenv, fetchurl, autoconf, cairo, opencv, pkg-config }: stdenv.mkDerivation rec { pname = "frei0r-plugins"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0"; }; - nativeBuildInputs = [ autoconf pkgconfig ]; + nativeBuildInputs = [ autoconf pkg-config ]; buildInputs = [ cairo opencv ]; postInstall = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index f10af240720..0055811e185 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -3,7 +3,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , fixDarwinDylibNames , python3 }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { patchShebangs test ''; - nativeBuildInputs = [ meson ninja pkgconfig ] + nativeBuildInputs = [ meson ninja pkg-config ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix index 7b1adb3e3f0..cd36af184b4 100644 --- a/pkgs/development/libraries/fstrm/default.nix +++ b/pkgs/development/libraries/fstrm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, openssl }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libevent, openssl }: stdenv.mkDerivation rec { pname = "fstrm"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libevent openssl ]; preBuild = '' diff --git a/pkgs/development/libraries/gaia/default.nix b/pkgs/development/libraries/gaia/default.nix index 46ed3626d2a..701ee355667 100644 --- a/pkgs/development/libraries/gaia/default.nix +++ b/pkgs/development/libraries/gaia/default.nix @@ -4,7 +4,7 @@ , libyaml , swig , eigen -, pkgconfig +, pkg-config , python2 , wafHook , makeWrapper @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - pkgconfig + pkg-config python2 # For wafHook swig wafHook diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 89096c88745..eb11bc6d72b 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, autoreconfHook }: +{ stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }: let cross = stdenv.hostPlatform != stdenv.buildPlatform; @@ -10,7 +10,7 @@ in stdenv.mkDerivation (rec { sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib ]; diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index cf9b0486304..13056846017 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python, wafHook }: +{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python, wafHook }: stdenv.mkDerivation rec { pname = "ganv"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ graphviz gtk2 gtkmm2 python ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 0034f7ed633..9d9e6cd1c15 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -5,7 +5,7 @@ , gtk-doc , docbook_xsl , docbook_xml_dtd_43 -, pkgconfig +, pkg-config , meson , ninja , git @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meson ninja git - pkgconfig + pkg-config vala gettext gobject-introspection diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 212b087fbe2..a2eea019400 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , meson , ninja , gettext @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ - pkgconfig + pkg-config meson python3 ninja diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index 893fc4f8d27..22034733f5e 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, pkgconfig, mono, dotnetPackages }: +{ stdenv, fetchsvn, pkg-config, mono, dotnetPackages }: let newtonsoft-json = dotnetPackages.NewtonsoftJson; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "0b0rvgg3xsbbg2fdrpz0ywsy9rcahlyfskndaagd3yzm83gi6bhk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono newtonsoft-json ]; sourceRoot = "svn-r1217/clients/cs"; diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix index 338d0b6b91b..7b3d1d4e831 100644 --- a/pkgs/development/libraries/gdl/default.nix +++ b/pkgs/development/libraries/gdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: +{ stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome3, intltool }: stdenv.mkDerivation rec { pname = "gdl"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "00ldva6wg6s4wlxmisiqzyz8ihsprra7sninx2rlqk6frpq312w5"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ libxml2 gtk3 ]; passthru = { diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix index e38cb7535b0..ec0621c5a3d 100644 --- a/pkgs/development/libraries/gdome2/default.nix +++ b/pkgs/development/libraries/gdome2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, libxml2, gtk-doc}: +{stdenv, fetchurl, pkg-config, glib, libxml2, gtk-doc}: let pname = "gdome2"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libxml2 gtk-doc ]; propagatedBuildInputs = [glib libxml2]; patches = [ ./xml-document.patch ]; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index c25f9145ea5..4852db0dac3 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , vala , gobject-introspection , gtk-doc @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config gettext meson ninja diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index a99ec05d771..93adb49d8b7 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , babl , libpng , cairo @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] ++ stdenv.lib.optional stdenv.isDarwin OpenGL; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; doCheck = false; # fails 3 out of 19 tests diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index fd3924fec3e..b7623d15dd4 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig +, pkg-config , python3Packages , wrapGAppsHook , atk @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; [ pygobject3 ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython]; + nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython]; buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver ]; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 74d778c5c55..8e54c6c43b0 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf +{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkg-config, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf , modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobject-introspection, vala , withDemoAgent ? false }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig intltool meson ninja wrapGAppsHook python3 vala gobject-introspection + pkg-config intltool meson ninja wrapGAppsHook python3 vala gobject-introspection # devdoc gtk-doc docbook_xsl docbook_xml_dtd_412 ]; diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index ec9bf2e5cb9..a13cbdfc159 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }: +{ fetchurl, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }: stdenv.mkDerivation rec { pname = "geocode-glib"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gettext gtk-doc docbook_xsl gobject-introspection ]; buildInputs = [ glib libsoup json-glib ]; patches = [ diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 9b72ca3524c..b9d287ba2eb 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: stdenv.mkDerivation rec { pname = "gexiv2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0xxxq8xdkgkn146my307jgws4qgxx477h0ybg1mqza1ycmczvsla"; }; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ glib ]; propagatedBuildInputs = [ exiv2 ]; diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index 4718e6ac015..93286e85d12 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, librest, gnome-online-accounts +{ stdenv, fetchurl, pkg-config, glib, librest, gnome-online-accounts , gnome3, libsoup, json-glib, gobject-introspection , gtk-doc, pkgs, docbook-xsl-nons, autoconf, automake, libtool }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig gobject-introspection gtk-doc + pkg-config gobject-introspection gtk-doc docbook-xsl-nons autoconf automake libtool ]; buildInputs = [ glib gnome-online-accounts ]; diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index a19febbfd66..f315679c9b7 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, glib, gtk-sharp-2_0 }: +{ stdenv, fetchFromGitHub, autoconf, automake, which, pkg-config, mono, glib, gtk-sharp-2_0 }: stdenv.mkDerivation rec { pname = "gio-sharp"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "13pc529pjabj7lq23dbndc26ssmg5wkhc7lfvwapm87j711m0zig"; }; - nativeBuildInputs = [ pkgconfig autoconf automake which ]; + nativeBuildInputs = [ pkg-config autoconf automake which ]; buildInputs = [ mono glib gtk-sharp-2_0 ]; dontStrip = true; diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 9437d76335d..5bcea279819 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -3,7 +3,7 @@ , stdenv , meson , ninja -, pkgconfig +, pkg-config , gnome3 , gtk3 , atk @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config makeWrapper which # for locale detection libxml2 # for xml-stripblanks diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index fc85b50e07f..31e066e8a25 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -4,7 +4,7 @@ , meson , ninja , nixosTests -, pkgconfig +, pkg-config , glib , gettext , makeWrapper @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext makeWrapper python3 # for install_script diff --git a/pkgs/development/libraries/glib-testing/default.nix b/pkgs/development/libraries/glib-testing/default.nix index 085dfc7344f..b04cbfe36d0 100644 --- a/pkgs/development/libraries/glib-testing/default.nix +++ b/pkgs/development/libraries/glib-testing/default.nix @@ -2,7 +2,7 @@ , fetchFromGitLab , meson , ninja -, pkgconfig +, pkg-config , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gtk-doc docbook-xsl-nons docbook_xml_dtd_43 diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 57f05d410fb..da1eb076536 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3 +{ config, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3 , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) , util-linuxMinimal ? null @@ -29,7 +29,7 @@ assert stdenv.isLinux -> util-linuxMinimal != null; * Support org.freedesktop.Application, including D-Bus activation from desktop files */ let - # Some packages don't get "Cflags" from pkgconfig correctly + # Some packages don't get "Cflags" from pkg-config correctly # and then fail to build when directly including like . # This is intended to be run in postInstall of any package # which has $out/include/ containing just some disjunct directories. @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { ]); nativeBuildInputs = [ - meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 + meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ]; diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 53e924b1325..c737ee9ec45 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx, gnome3, darwin }: +{ stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin }: stdenv.mkDerivation rec { pname = "glibmm"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ - pkgconfig + pkg-config gnum4 glib # for glib-compile-schemas ]; diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix index 3ab157598a4..6f53cda536a 100644 --- a/pkgs/development/libraries/globalplatform/default.nix +++ b/pkgs/development/libraries/globalplatform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, zlib, openssl_1_0_2, pcsclite }: +{ stdenv, fetchurl, pkg-config, zlib, openssl_1_0_2, pcsclite }: stdenv.mkDerivation rec { pname = "globalplatform"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib openssl_1_0_2 pcsclite ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix index 043be9e91b5..33a6954d695 100644 --- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix +++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, globalplatform, openssl_1_0_2, pcsclite }: +{ stdenv, fetchurl, pkg-config, globalplatform, openssl_1_0_2, pcsclite }: stdenv.mkDerivation rec { pname = "gppcscconnectionplugin"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ globalplatform openssl_1_0_2 pcsclite ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix index c902aac23a1..05bb4018229 100644 --- a/pkgs/development/libraries/gmime/2.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, libgpgerror, gobject-introspection }: +{ stdenv, fetchurl, pkg-config, glib, zlib, gnupg, libgpgerror, gobject-introspection }: stdenv.mkDerivation rec { version = "2.6.23"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig gobject-introspection ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; propagatedBuildInputs = [ glib zlib libgpgerror ]; configureFlags = [ "--enable-introspection=yes" ]; diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index f2ba29d461e..01ddde2ca89 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection +{ stdenv, fetchurl, pkg-config, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection , vala }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ vala gobject-introspection zlib gpgme libidn2 libunistring ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ glib ]; configureFlags = [ "--enable-introspection=yes" diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix index f6516815bb9..81e33c39a7d 100644 --- a/pkgs/development/libraries/gmtk/default.nix +++ b/pkgs/development/libraries/gmtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, substituteAll, fetchFromGitHub, libtool, pkgconfig, intltool, glib, gtk3 +{stdenv, substituteAll, fetchFromGitHub, libtool, pkg-config, intltool, glib, gtk3 , libpulseaudio, mplayer, gnome_mplayer }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1zb5m1y1gckal3140gvx31572a6xpccwfmdwa1w5lx2wdq1pwk1i"; }; - nativeBuildInputs = [ libtool pkgconfig intltool ]; + nativeBuildInputs = [ libtool pkg-config intltool ]; buildInputs = [ glib gtk3 libpulseaudio ]; patches = [ diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index 749b021890a..91522e3f126 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, glib, libtool }: +{stdenv, fetchFromGitHub, pkg-config, autoconf, automake, glib, libtool }: stdenv.mkDerivation { name = "gnet-2.0.8"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake glib libtool ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index f8e25640f29..3d4d8be3f1a 100644 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, gnome3 }: +{ stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-menus"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ glib gobject-introspection ]; passthru = { diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index 5926f59cc37..efd95d0f973 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, pkgconfig +, pkg-config , gtk2 , mono , gtk-sharp-2_0 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z"; }; - nativeBuildInputs = [ pkgconfig autoconf automake libtool which ]; + nativeBuildInputs = [ pkg-config autoconf automake libtool which ]; buildInputs = [ gtk2 mono gtk-sharp-2_0 ] ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]); diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix index dfbb2c3b1e6..41a0cb297c4 100644 --- a/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , meson , ninja , gettext @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext ]; diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index c6d35b68236..245b0c1e638 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkg-config, lzip , perl, gmp, autogen, libidn, p11-kit, unbound, libiconv , guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake @@ -62,12 +62,12 @@ stdenv.mkDerivation { ++ [ unbound ] ++ lib.optional guileBindings guile; - nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; + nativeBuildInputs = [ perl pkg-config ] ++ nativeBuildInputs; #inherit doCheck; doCheck = false; - # Fixup broken libtool and pkgconfig files + # Fixup broken libtool and pkg-config files preFixup = lib.optionalString (!stdenv.isDarwin) '' sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \ -e 's,-lz,-L${zlib.out}/lib -lz,' \ diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index ae3775002ec..2cd1e783ea9 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip , perl, gmp, autoconf, autogen, automake, libidn, p11-kit, libiconv , unbound, dns-root-data, gettext, cacert, util-linux , guileBindings ? config.gnutls.guile or false, guile @@ -40,7 +40,7 @@ stdenv.mkDerivation { ++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; # Skip some tests: - # - pkgconfig: building against the result won't work before installing (3.5.11) + # - pkg-config: building against the result won't work before installing (3.5.11) # - fastopen: no idea; it broke between 3.6.2 and 3.6.3 (3437fdde6 in particular) # - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox (3.5.11) # - psk-file: no idea; it broke between 3.6.3 and 3.6.4 @@ -76,7 +76,7 @@ stdenv.mkDerivation { ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile; - nativeBuildInputs = [ perl pkgconfig ] + nativeBuildInputs = [ perl pkg-config ] ++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ] ++ lib.optionals doCheck [ which nettools util-linux ]; @@ -87,7 +87,7 @@ stdenv.mkDerivation { # Error setting the x509 trust file: Error while reading file. checkInputs = [ cacert ]; - # Fixup broken libtool and pkgconfig files + # Fixup broken libtool and pkg-config files preFixup = lib.optionalString (!isDarwin) '' sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \ -e 's,-lz,-L${zlib.out}/lib -lz,' \ diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 46b40d00d78..d9cffbc228e 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3, lasem +{ fetchurl, stdenv, pkg-config, intltool, glib, gtk3, lasem , libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome3 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; propagatedBuildInputs = [ glib gtk3 libxml2 cairo pango libgsf lasem diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index 753db22f4f9..2be144fc4c6 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , glib , python3 , sqlite @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index a744cf314e2..ae583f5ac8b 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }: +{ stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }: let version = "2.0.4"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"; }; - nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ]; + nativeBuildInputs = [ pkg-config gettext gtk-doc python2 ]; buildInputs = [ gtk3 cairo glib gobject-introspection ]; configureFlags = [ diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 024ac363af1..825e0cbe194 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, cairo, glib, pkgconfig, gnome3 }: +{ stdenv, fetchurl, gtk2, cairo, glib, pkg-config, gnome3 }: stdenv.mkDerivation rec { pname = "goocanvas"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07kicpcacbqm3inp7zq32ldp95mxx4kfxpaazd0x5jk7hpw2w1qw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 cairo glib ]; passthru = { diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix index d8a910d4799..e68094f9d52 100644 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, goocanvas2, gtkmm3, gnome3 }: +{ stdenv, fetchurl, pkg-config, goocanvas2, gtkmm3, gnome3 }: stdenv.mkDerivation rec { pname = "goocanvasmm"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0vpdfrj59nwzwj8bk4s0h05iyql62pxjzsxh72g3vry07s3i3zw0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ gtkmm3 goocanvas2 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 489b6001342..4b96b493cf5 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch -, autoreconfHook, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan +, autoreconfHook, libgpgerror, gnupg, pkg-config, glib, pth, libassuan , file, which, ncurses , texinfo , buildPackages @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { [ libgpgerror glib libassuan pth ] ++ lib.optional (qtbase != null) qtbase; - nativeBuildInputs = [ pkgconfig gnupg texinfo autoreconfHook ] + nativeBuildInputs = [ pkg-config gnupg texinfo autoreconfHook ] ++ lib.optionals pythonSupport [ python swig2 which ncurses ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix index 6efc1fca39a..bd1c8434949 100644 --- a/pkgs/development/libraries/grail/default.nix +++ b/pkgs/development/libraries/grail/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true, - stdenv, fetchurl, pkgconfig, xorg, python3, frame }: + stdenv, fetchurl, pkg-config, xorg, python3, frame }: stdenv.mkDerivation rec { pname = "grail"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python3 frame ] ++ stdenv.lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes]; diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index ee147d82afd..f72b354f161 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , nix-update-script -, pkgconfig +, pkg-config , meson , ninja , python3 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config gobject-introspection python3 ]; diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 9073a501c09..07bad7745d6 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -3,7 +3,7 @@ , substituteAll , meson , ninja -, pkgconfig +, pkg-config , gettext , gperf , sqlite @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext itstool gperf # for lua-factory diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index 858e8d81fd4..7a3667af880 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3 +{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43 , libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }: @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson ninja pkgconfig gettext gobject-introspection vala + meson ninja pkg-config gettext gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ]; diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 1032f15196c..3c6b2688b77 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , glib , gobject-introspection , meson @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { glib meson ninja - pkgconfig + pkg-config python3 ]; diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix index cbba9c5fcea..9bb6bd17f40 100644 --- a/pkgs/development/libraries/gsettings-qt/default.nix +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig +{ stdenv, fetchFromGitLab, pkg-config , qmake, qtbase, qtdeclarative, wrapQtAppsHook , glib, gobject-introspection , genericUpdater, common-updater-scripts @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config qmake gobject-introspection wrapQtAppsHook diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix index b0db776bd61..dda751acfb1 100644 --- a/pkgs/development/libraries/gsignond/default.nix +++ b/pkgs/development/libraries/gsignond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, glib-networking +{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, glib-networking , sqlite, gobject-introspection, vala, gtk-doc, libsecret, docbook_xsl , docbook_xml_dtd_43, docbook_xml_dtd_45, glibcLocales, makeWrapper , symlinkJoin, gsignondPlugins, plugins }: @@ -26,7 +26,7 @@ unwrapped = stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index b1a383ee591..72d1a8e90ff 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: +{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: stdenv.mkDerivation { pname = "gsignond-plugin-lastfm"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { gobject-introspection meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix index 4ac6e6a6f9f..240d47f6dd2 100644 --- a/pkgs/development/libraries/gsignond/plugins/mail.nix +++ b/pkgs/development/libraries/gsignond/plugins/mail.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobject-introspection }: +{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, gobject-introspection }: stdenv.mkDerivation rec { pname = "gsignond-plugin-mail"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index b4b16a57af4..b1d673eea95 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, check +{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, check , json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 , docbook_xsl, glibcLocales, gobject-introspection }: @@ -23,7 +23,7 @@ stdenv.mkDerivation { gtk-doc meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix index 1a1f34681ce..8fc63383831 100644 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, gsasl, check +{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, gsasl, check , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }: stdenv.mkDerivation { @@ -22,7 +22,7 @@ stdenv.mkDerivation { gtk-doc meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index bae1b17e532..9fc099fd3dd 100644 --- a/pkgs/development/libraries/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }: +{ stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }: stdenv.mkDerivation rec { pname = "gsound"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53"; }; - nativeBuildInputs = [ pkgconfig gobject-introspection libtool vala ]; + nativeBuildInputs = [ pkg-config gobject-introspection libtool vala ]; buildInputs = [ glib libcanberra ]; passthru = { diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 37e54c82595..a240db6c04d 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , libxml2 , glib , gtk3 @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config vala gobject-introspection libxml2 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - # required for pkgconfig + # required for pkg-config enchant2 ]; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 0a808b71a71..0ab377c2e29 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , vala , gtk-doc @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gobject-introspection vala gtk-doc diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 49343e79c87..58b33f6c2f9 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -5,7 +5,7 @@ , ninja , gettext , config -, pkgconfig +, pkg-config , python3 , gst-plugins-base , orc @@ -105,7 +105,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config orc # for orcc python3 gettext diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 4728e49c516..bac59ac4c48 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , lib -, pkgconfig +, pkg-config , meson , ninja , gettext @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 gettext orc diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 0d33d28196c..a5b4c0b827a 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , gobject-introspection , bison @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext bison flex @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing ] ++ lib.optionals stdenv.isDarwin [ - # darwin.libunwind doesn't have pkgconfig definitions so meson doesn't detect it. + # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it. "-Dlibunwind=disabled" "-Dlibdw=disabled" ]; diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 6743a5ecd67..1665c7f8a13 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gstreamer , gst-plugins-base , python3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gobject-introspection # documentation diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 75e065e6d2b..4ccb2e2c286 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , python3 , bash-completion , gst-plugins-base @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext gobject-introspection gst-devtools diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index d4c3b99c7ca..4bbdfdad69d 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -3,7 +3,7 @@ , meson , nasm , ninja -, pkgconfig +, pkg-config , python3 , gst-plugins-base , orc @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config python3 meson ninja diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 35c278da03b..51d0fcc8efd 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1, gnome3 }: +{ stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome3 }: stdenv.mkDerivation rec { pname = "gstreamermm"; version = "1.10.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig file ]; + nativeBuildInputs = [ pkg-config file ]; propagatedBuildInputs = [ glibmm gst_all_1.gst-plugins-base ]; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index c75d439cd53..3175cff4aca 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -3,7 +3,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , python3 , gst-plugins-base , gettext @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meson ninja gettext - pkgconfig + pkg-config python3 ]; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 4167b172776..16de3a6e65f 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , python3 , gettext , gobject-introspection @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ninja gettext gobject-introspection - pkgconfig + pkg-config python3 # documentation diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 1cdc0a51930..8f35829ed38 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , python3 , gst-plugins-base , orc @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meson ninja gettext - pkgconfig + pkg-config python3 ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 52a6cb27894..e758568b2bb 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gst-plugins-base , bzip2 , libva @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config bzip2 # documentation diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index b848af6c318..7b25d6dd725 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkgconfig}: +{stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkg-config}: let s = # Generated upstream information rec { @@ -9,7 +9,7 @@ let url="https://foicica.com/gtdialog/download/gtdialog_1.4.zip"; sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cdk unzip gtk2 glib ncurses ]; diff --git a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix index 99ca221f5ba..e595f6bf02d 100644 --- a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix +++ b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: +{ stdenv, fetchurl, pkg-config, intltool, gtk2 }: stdenv.mkDerivation { name = "gtk-engine-bluecurve-1.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ gtk2 ]; diff --git a/pkgs/development/libraries/gtk-engine-murrine/default.nix b/pkgs/development/libraries/gtk-engine-murrine/default.nix index 9acb7b25a0d..f5ae9c0552d 100644 --- a/pkgs/development/libraries/gtk-engine-murrine/default.nix +++ b/pkgs/development/libraries/gtk-engine-murrine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: +{ stdenv, fetchurl, pkg-config, intltool, gtk2 }: stdenv.mkDerivation rec { pname = "gtk-engine-murrine"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool gtk2 ]; meta = { diff --git a/pkgs/development/libraries/gtk-engines/default.nix b/pkgs/development/libraries/gtk-engines/default.nix index 2f56f6eb4c5..077bb53443a 100644 --- a/pkgs/development/libraries/gtk-engines/default.nix +++ b/pkgs/development/libraries/gtk-engines/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: +{ stdenv, fetchurl, pkg-config, intltool, gtk2 }: stdenv.mkDerivation { name = "gtk-engines-2.20.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool gtk2 ]; meta = { diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index 5cf62b319a6..d6df10db176 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobject-introspection }: +{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, glib, gtk-doc, gtk, gobject-introspection }: stdenv.mkDerivation rec { pname = "gtk-mac-integration"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1w0agv4r0daklv5d2f3l0c10krravjq8bj9hsdsrpka48dbnqmap"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc gobject-introspection ]; + nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc gobject-introspection ]; buildInputs = [ glib ]; propagatedBuildInputs = [ gtk ]; diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix index 2b83a8ef52e..9daf3bb91e5 100644 --- a/pkgs/development/libraries/gtk-sharp-beans/default.nix +++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp-2_0, gio-sharp }: +{ stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono, gtk-sharp-2_0, gio-sharp }: stdenv.mkDerivation rec { pname = "gtk-sharp-beans"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "04sylwdllb6gazzs2m4jjfn14mil9l3cny2q0xf0zkhczzih6ah1"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook which ]; + nativeBuildInputs = [ pkg-config autoreconfHook which ]; buildInputs = [ mono gtk-sharp-2_0 gio-sharp ]; dontStrip = true; diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index ed53105f758..5afcb2d285a 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, pkgconfig +, pkg-config , mono , glib , pango @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { popd ''; - nativeBuildInputs = [ pkgconfig autoconf automake libtool which ]; + nativeBuildInputs = [ pkg-config autoconf automake libtool which ]; buildInputs = [ mono glib pango gtk2 GConf libglade libgnomecanvas diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index 49405c655e1..576ad670bdb 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , mono , glib , pango @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono glib pango gtk3 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index be5f8521f9c..bd1b15b59e2 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg +{ config, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg , gdk-pixbuf, xlibsWrapper, gobject-introspection , xineramaSupport ? stdenv.isLinux , cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ./hooks/drop-icon-theme-cache.sh ]; - nativeBuildInputs = setupHooks ++ [ perl pkgconfig gettext gobject-introspection ]; + nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ]; patches = [ ./patches/2.0-immodules.cache.patch diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 59685ca07cc..d802ee7e44f 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , gettext , docbook_xsl , docbook_xml_dtd_43 @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { makeWrapper meson ninja - pkgconfig + pkg-config python3 sassc ] ++ setupHooks ++ optionals withGtkDoc [ diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index 5cef820db14..89c674f09d5 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg -, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkgconfig, which, vte }: +, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }: let inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ dmd pkgconfig which ]; + nativeBuildInputs = [ dmd pkg-config which ]; propagatedBuildInputs = [ atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4 libgda libpeas librsvg pango vte @@ -117,7 +117,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" - "PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" + "PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" ]; # The .pc files does not declare an `includedir=`, so the multiple diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index 54054270c3c..8246d80a10f 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2 }: +{ stdenv, fetchurl, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "gtkdatabox-0.9.3.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1rdxnjgh6v3yjqgsfmamyzpfxckzchps4kqvvz88nifmd7ckhjfh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ gtk2 ]; diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index babcaa99334..65b6fd1b43d 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gtk2 }: +{ fetchurl, stdenv, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "gtkimageview-1.6.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1if3yh5z6nkv5wnkk0qyy9pkk03vn5rqbfk23q87kj39pqscgr37"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; preConfigure = '' diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index 0c72f8501cc..d5a10171bdf 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }: +{stdenv, fetchurl, pkg-config, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }: let pname = "gtkmathview"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0hwcamf5fi35frg7q6kgisc9v0prqbhsplb2gl55cg3av9sh3hqx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ t1lib glib gmetadom libxml2 popt]; propagatedBuildInputs = [gtk2 t1lib]; diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 24262d263cb..0e04cb710dc 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, glibmm, cairomm, pangomm, atkmm }: +{ stdenv, fetchurl, pkg-config, gtk2, glibmm, cairomm, pangomm, atkmm }: stdenv.mkDerivation rec { name = "gtkmm-${minVer}.5"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ]; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 5794b2ddf46..523cb5c59d8 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: +{ stdenv, fetchurl, pkg-config, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: stdenv.mkDerivation rec { pname = "gtkmm"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ epoxy ]; propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index d32a0eebf13..870637202c4 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala +{ stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala , libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala ]; + nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ]; checkInputs = [ xvfb_run dbus ]; diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 2041e83fb0c..0254c096c14 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, fribidi, vala +{ stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala , libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info , meson, ninja }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext perl gobject-introspection vala ]; + nativeBuildInputs = [ meson ninja pkg-config gettext perl gobject-introspection vala ]; checkInputs = [ xvfb_run dbus ]; diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix index 1607a581996..d05e1ebf83e 100644 --- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview4, gnome3 }: +{ stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome3 }: stdenv.mkDerivation rec { pname = "gtksourceviewmm"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ glibmm gtkmm3 gtksourceview4 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index 7bf510207ab..675ced4ee49 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }: +{ stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome3 }: stdenv.mkDerivation rec { pname = "gtksourceviewmm"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glibmm gtkmm3 gtksourceview3 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index 707acfcd382..721db5983d7 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobject-introspection, vala}: +{stdenv, fetchurl, gtk3, aspell, pkg-config, enchant, isocodes, intltool, gobject-introspection, vala}: stdenv.mkDerivation rec { pname = "gtkspell"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0cjp6xdcnzh6kka42w9g0w2ihqjlq8yl8hjm9wsfnixk6qwgch5h"; }; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection vala ]; + nativeBuildInputs = [ pkg-config intltool gobject-introspection vala ]; buildInputs = [ aspell gtk3 enchant isocodes ]; propagatedBuildInputs = [ enchant ]; diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index b6ee2c6825d..a1305a435b2 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, aspell, pkgconfig, enchant, intltool}: +{stdenv, fetchurl, gtk2, aspell, pkg-config, enchant, intltool}: stdenv.mkDerivation { name = "gtkspell-2.0.16"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [aspell gtk2 enchant intltool]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix index b3bca9bd7b6..47edb03985d 100644 --- a/pkgs/development/libraries/gtkspellmm/default.nix +++ b/pkgs/development/libraries/gtkspellmm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig +, pkg-config , gtk3, glib, glibmm, gtkmm3, gtkspell3 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { gtkspell3 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 glib glibmm gtkmm3 ]; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 48bdfc9b5e1..3738baa21ae 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, autoreconfHook, gettext, glib, buildPackages }: +{ fetchurl, stdenv, pkg-config, autoreconfHook, gettext, glib, buildPackages }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook glib # required to satisfy AM_PATH_GLIB_2_0 ]; diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 80fb9e3afff..d288f09b36a 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , gobject-introspection , vala , gtk-doc @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection vala gtk-doc diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index 8fc001de3d5..6b5f80a0e51 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , gobject-introspection , vala , gtk-doc @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection vala gtk-doc diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index a8ed1f7cadd..d5aa7a99196 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , autoreconfHook -, pkgconfig +, pkg-config , gettext , gobject-introspection , gtk-doc @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook gettext gobject-introspection diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 153eb681d63..7f606c10b6b 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -3,7 +3,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , vala , gtk-doc @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gobject-introspection vala gtk-doc diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index a2e15769145..1d0c5e1b027 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobject-introspection +{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, gobject-introspection , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3 , glib, systemd, libusb1, vala, hwdata }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gettext pythonEnv + meson ninja pkg-config gettext pythonEnv gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 gobject-introspection vala ]; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index f79ffa579c8..1b840eba73a 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , dbus , glib @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meson ninja python3 - pkgconfig + pkg-config gettext wrapGAppsHook libxml2 diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 8ef8b55be52..2c415b39df3 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkgconfig, +{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkg-config, boost, libtool, perlPackages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2 - tcl libusb-compat-0_1 pkgconfig boost libtool ]; + tcl libusb-compat-0_1 pkg-config boost libtool ]; configureFlags = [ "--with-perl-binding" "--with-python-binding" "--with-tcl-binding" "--with-rigmatrix" ]; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 6c5703f521d..c0e1be30253 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, glib, freetype, cairo, libintl +{ stdenv, fetchFromGitHub, pkg-config, glib, freetype, cairo, libintl , meson, ninja , gobject-introspection , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. @@ -50,7 +50,7 @@ stdenv.mkDerivation { ninja gobject-introspection libintl - pkgconfig + pkg-config python3 gtk-doc docbook-xsl-nons diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index c42a3528223..2251bb7a91a 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb1 +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, udev, libusb1 , darwin }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1nr4z4b10vpbh3ss525r7spz4i43zim2ba5qzfl15dgdxshxxivb"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ]; diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index ee22726414a..1afbe8a2f75 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper +{ stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper , perlPackages, libxml2, libiconv }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./hivex-syms.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoreconfHook makeWrapper libxml2 ] diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 561a4693c1d..3c8ffee1bde 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, expat, ncurses, pciutils, numactl +{ stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl , x11Support ? false, libX11 ? null, cairo ? null }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation { ]; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # Filter out `null' inputs. This allows users to `.override' the # derivation and set optional dependencies to `null'. diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix index 09b7751c828..073e9d16686 100644 --- a/pkgs/development/libraries/hyena/default.nix +++ b/pkgs/development/libraries/hyena/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mono, gtk-sharp-2_0, monoDLLFixer }: +{ stdenv, fetchurl, pkg-config, mono, gtk-sharp-2_0, monoDLLFixer }: stdenv.mkDerivation rec { pname = "hyena"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "eb7154a42b6529bb9746c39272719f3168d6363ed4bad305a916ed7d90bc8de9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono gtk-sharp-2_0 ]; diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/development/libraries/hyperscan/default.nix index 17246f0aa0a..18e028b70ca 100644 --- a/pkgs/development/libraries/hyperscan/default.nix +++ b/pkgs/development/libraries/hyperscan/default.nix @@ -4,8 +4,8 @@ , withStatic ? false # build only shared libs by default, build static+shared if true }: -# NOTICE: pkgconfig, pcap and pcre intentionally omitted from build inputs -# pcap used only in examples, pkgconfig used only to check for pcre +# NOTICE: pkg-config, pcap and pcre intentionally omitted from build inputs +# pcap used only in examples, pkg-config used only to check for pcre # which is fixed 8.41 version requirement (nixpkgs have 8.42+, and # I not see any reason (for now) to backport 8.41. diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 7d801521038..b98588eb410 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, - pkgconfig, autoreconfHook, + pkg-config, autoreconfHook, flex, yacc, zlib, libxml2 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0cb0kp6mpmgz74kbymqw4xxads8ff7jh0n59dsm76xy6nn8hpqcz"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ flex yacc zlib libxml2 ]; # Normally, igraph wants us to call bootstrap.sh, which will call diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix index 7f7645edc91..d9c01ab5fcf 100644 --- a/pkgs/development/libraries/iksemel/default.nix +++ b/pkgs/development/libraries/iksemel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, libtool, pkgconfig, gnutls, fetchFromGitHub, texinfo }: +{ stdenv, autoreconfHook, libtool, pkg-config, gnutls, fetchFromGitHub, texinfo }: stdenv.mkDerivation rec { pname = "iksemel"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1xv302p344hnpxqcgs3z6wwxhrik39ckgfw5cjyrw0dkf316z9yh"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook libtool texinfo ]; + nativeBuildInputs = [ pkg-config autoreconfHook libtool texinfo ]; buildInputs = [ gnutls ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix index 6f789174ec0..26e63747523 100644 --- a/pkgs/development/libraries/ilixi/default.nix +++ b/pkgs/development/libraries/ilixi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, directfb, libsigcxx, libxml2, fontconfig }: +{ stdenv, fetchurl, pkg-config, directfb, libsigcxx, libxml2, fontconfig }: # TODO: optional deps: baresip, FusionDale, FusionSound, SaWMan, doxygen, # Reflex, Wnn, NLS @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1kmdmqf68jiv7y6as41bhbgdy70yy2i811a3l6kccbazlzpif34v"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ directfb libsigcxx libxml2 fontconfig ]; configureFlags = [ diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 458b3d29d52..aabfff908c1 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -3,7 +3,7 @@ , libjpeg, libtiff, giflib, libpng, libwebp # imlib2 can load images from ID3 tags. , libid3tag -, freetype , bzip2, pkgconfig +, freetype , bzip2, pkg-config , x11Support ? true, xlibsWrapper ? null }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { bzip2 freetype libid3tag ] ++ optional x11Support xlibsWrapper; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index 6ac74988dff..f75ade98c6d 100644 --- a/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, file -, pkgconfig, autoconf +, pkg-config, autoconf , glib, dbus-glib, json-glib , gtk2, libindicator-gtk2, libdbusmenu-gtk2, libappindicator-gtk2 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1xqsb6c1pwawabw854f7aybjrgyhc2r1316i9lyjspci51zk5m7v"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ glib dbus-glib json-glib diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index a523019e78c..5588a157c46 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -1,5 +1,5 @@ { stdenv, fetchbzr -, pkgconfig, systemd, autoreconfHook +, pkg-config, systemd, autoreconfHook , glib, dbus-glib, json-glib , gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1f0jdyqqb5g86zdpbcyn16x94yjigsfiv2kf73dvni5rp1vafbq1"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib dbus-glib json-glib systemd diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 71e6d3d700a..1fe45a49258 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11 +{ stdenv, fetchFromGitHub, cmake, pkg-config, gtest, libdrm, libpciaccess, libva, libX11 , libXau, libXdmcp, libpthreadstubs }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0qnq43qjcmzkn6v2aymzi3kycndk9xw6m5f5g5sz5x53nz556bp0"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libdrm libva libpciaccess libX11 libXau libXdmcp libpthreadstubs ]; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 598ad52de04..59a883e1f96 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper -, pkgconfig, libX11, libuuid, xz, vtk_7, Cocoa }: +, pkg-config, libX11, libuuid, xz, vtk_7, Cocoa }: stdenv.mkDerivation rec { pname = "itk"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; postInstall = '' - wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkgconfig}/bin" + wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin" ''; meta = { diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index b96c9171324..4cbdca9932f 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2 +{ stdenv, lib, fetchurl, unzip, jdk, pkg-config, gtk2 , libXt, libXtst, libXi, libGLU, libGL, webkitgtk, libsoup, xorg , pango, gdk-pixbuf, glib }: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { sourceRoot = "."; - nativeBuildInputs = [ unzip pkgconfig ]; + nativeBuildInputs = [ unzip pkg-config ]; buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU libGL webkitgtk libsoup ]; NIX_LFLAGS = toString (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) + diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/development/libraries/jose/default.nix index 4c3095681ed..b15fead6269 100644 --- a/pkgs/development/libraries/jose/default.nix +++ b/pkgs/development/libraries/jose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , zlib, jansson, openssl }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "15ac8a656m66rd9qg4dj53smykwaagqv606h18w7fiqn0ykxl4vi"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ zlib jansson openssl ]; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index f89d4bc4534..07e6d679aa7 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, meson, ninja, pkgconfig, gettext +{ stdenv, fetchurl, glib, meson, ninja, pkg-config, gettext , gobject-introspection, fixDarwinDylibNames, gnome3 }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ] + nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index 61f357689c4..da84578d780 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: +{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; version = "3.38.0"; outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ glib json-glib ]; src = fetchurl { diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index 645d05afc2b..0aa400c644d 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, cmake, pkgconfig }: +{ mkDerivation, lib, cmake, pkg-config }: mkDerivation { name = "extra-cmake-modules"; @@ -9,7 +9,7 @@ mkDerivation { outputs = [ "out" ]; # this package has no runtime components - propagatedBuildInputs = [ cmake pkgconfig ]; + propagatedBuildInputs = [ cmake pkg-config ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 2eb9262d189..e56dfd45834 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, perl, yacc, flex +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python2, perl, yacc, flex , texinfo, perlPackages , openldap, libcap_ng, sqlite, openssl, db, libedit, pam , CoreFoundation, Security, SystemConfiguration @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./heimdal-make-missing-headers.patch ]; - nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex texinfo ] + nativeBuildInputs = [ autoreconfHook pkg-config python2 perl yacc flex texinfo ] ++ (with perlPackages; [ JSON ]); buildInputs = optionals (stdenv.isLinux) [ libcap_ng ] ++ [ db sqlite openssl libedit openldap pam] diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 004d7d2227c..022b6db1a24 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, yacc, bootstrap_cmds +{ stdenv, fetchurl, pkg-config, perl, yacc, bootstrap_cmds , openssl, openldap, libedit, keyutils # Extra Arguments @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "ac_cv_printf_positional=yes" ]; - nativeBuildInputs = [ pkgconfig perl ] + nativeBuildInputs = [ pkg-config perl ] ++ optional (!libOnly) yacc # Provides the mig command used by the build scripts ++ optional stdenv.isDarwin bootstrap_cmds; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index e3084b9733e..6b42cff7903 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3 +{ stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome3 , gtk-doc, gtk2, python2Packages, lua, gobject-introspection }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool gnome3.gnome-common gtk-doc gtk2 python pygtk lua gobject-introspection diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index 1c8dbfdcd81..dde4e80f070 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3 +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome3 , gtk-doc, gtk3, libX11, libXext, libXrender, gobject-introspection }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "196ibn86j54fywfwwgyh89i9wygm4vh7ls19fn20vrnm6ijlzh9r"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ gnome3.gnome-common gtk-doc gtk3 libX11 libXext libXrender gobject-introspection diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index f00d7e59b74..02d216ca59c 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm +{ stdenv, fetchFromGitHub, cmake, pkg-config, libdrm , withPython ? false, python }: stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { cmakeFlags = stdenv.lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libdrm python ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index 4829d67de45..913353a32fe 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive +, automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive , libxml2, icu , languageMachines }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "frog-v${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 icu languageMachines.ticcutils diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix index 196a697d8f6..3560ae8e460 100644 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/pkgs/development/libraries/languagemachines/frogdata.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, libtool, pkg-config, autoconf-archive }: let @@ -11,7 +11,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "frogdata-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool autoconf-archive ]; diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index 852615cbf3b..297967351d9 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, libtool, pkg-config, autoconf-archive , libxml2, icu, bzip2, libtar , languageMachines }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "libfolia-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ]; preConfigure = "sh bootstrap.sh"; diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix index 9477abeef3f..7fee1ea3a3f 100644 --- a/pkgs/development/libraries/languagemachines/mbt.nix +++ b/pkgs/development/libraries/languagemachines/mbt.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive +, automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive , libxml2 , languageMachines }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "mbt-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix index 8676e08e417..c3999d1c558 100644 --- a/pkgs/development/libraries/languagemachines/ticcutils.nix +++ b/pkgs/development/libraries/languagemachines/ticcutils.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, libtool, pkg-config, autoconf-archive , libxml2, zlib, bzip2, libtar }: let @@ -11,7 +11,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "ticcutils-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool autoconf-archive libxml2 # optional: zlib bzip2 libtar diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix index b912ed97bd5..2e758257cbb 100644 --- a/pkgs/development/libraries/languagemachines/timbl.nix +++ b/pkgs/development/libraries/languagemachines/timbl.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, libtool, pkg-config, autoconf-archive , libxml2, bzip2, libtar , languageMachines }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "timbl-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix index e0634103a7e..56245f922d3 100644 --- a/pkgs/development/libraries/languagemachines/timblserver.nix +++ b/pkgs/development/libraries/languagemachines/timblserver.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive +, automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive , libxml2 , languageMachines }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "timblserver-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix index d60ff5fa246..e089942cd74 100644 --- a/pkgs/development/libraries/languagemachines/ucto.nix +++ b/pkgs/development/libraries/languagemachines/ucto.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, libtool, pkg-config, autoconf-archive , libxml2, icu, bzip2, libtar , languageMachines }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "ucto-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtool autoconf-archive icu libtar libxml2 languageMachines.ticcutils diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix index 29eaf78b75a..9d36a95b498 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, libtool, pkg-config, autoconf-archive }: let @@ -11,7 +11,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "uctodata-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool autoconf-archive ]; preConfigure = "sh bootstrap.sh"; diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix index b3742514ced..25d858cb64a 100644 --- a/pkgs/development/libraries/lasem/default.nix +++ b/pkgs/development/libraries/lasem/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, intltool, gobject-introspection, glib, gdk-pixbuf +{ fetchurl, stdenv, pkg-config, intltool, gobject-introspection, glib, gdk-pixbuf , libxml2, cairo, pango, gnome3 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0fds3fsx84ylsfvf55zp65y8xqjj5n8gbhcsk02vqglivk7izw4v"; }; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; + nativeBuildInputs = [ pkg-config intltool gobject-introspection ]; propagatedBuildInputs = [ glib gdk-pixbuf libxml2 cairo pango diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index c79b4a51262..f2224a872dd 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }: +{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkg-config, python27Packages, xmlsec, zlib }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ autoconf automake glib gobject-introspection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; configurePhase = '' diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index a0f0814fec5..de874cea3f1 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, which, gnuplot +{ stdenv, fetchurl, autoreconfHook, pkg-config, which, gnuplot , giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "192bs676ind8627f0v3v8d1q7r4xwc7q0zvbdbxn1fgvmv14d77c"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ giflib libjpeg libpng libtiff libwebp openjpeg zlib ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix index 54dbb349eb6..c2d81e31f3e 100644 --- a/pkgs/development/libraries/libabigail/default.nix +++ b/pkgs/development/libraries/libabigail/default.nix @@ -3,7 +3,7 @@ , autoreconfHook , elfutils , libxml2 -, pkgconfig +, pkg-config , strace , python3 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config strace ]; diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index 91107ad4cb0..4e33f30e8c1 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, doxygen, gperf, pkgconfig, librevenge, libxml2, perl }: +{ stdenv, fetchurl, boost, doxygen, gperf, pkg-config, librevenge, libxml2, perl }: stdenv.mkDerivation rec { pname = "libabw"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost doxygen gperf librevenge libxml2 perl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index 07e0a3500a7..3467b6c84c8 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, meson, ninja, glib, check, python3, vala, gtk-doc, glibcLocales -, libxml2, libxslt, pkgconfig, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: +, libxml2, libxslt, pkg-config, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: stdenv.mkDerivation rec { pname = "libaccounts-glib"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index 616879a979c..708aaff9bda 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc +{ stdenv, fetchurl, pkg-config, libtool, perl, bsdbuild, gettext, mandoc , libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU, libGL , libsndfile, portaudio, libmysqlclient, fontconfig }: @@ -26,7 +26,7 @@ stdenv.mkDerivation { outputs = [ "out" "devdoc" ]; - nativeBuildInputs = [ pkgconfig libtool gettext ]; + nativeBuildInputs = [ pkg-config libtool gettext ]; buildInputs = [ bsdbuild perl xlibsWrapper libXinerama SDL libGL libmysqlclient mandoc diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 3ecee2599f6..e702e292a0f 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, libpulseaudio, alsaLib, libcap +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, libpulseaudio, alsaLib, libcap , CoreAudio, CoreServices, AudioUnit , usePulseAudio }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isLinux [ alsaLib libcap ] ++ lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with stdenv.lib; { longDescription = '' diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 2c67e6ac158..2ebabe3273f 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3 }: +{ stdenv, fetchgit, yasm, perl, cmake, pkg-config, python3 }: stdenv.mkDerivation rec { pname = "libaom"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./outputs.patch ]; nativeBuildInputs = [ - yasm perl cmake pkgconfig python3 + yasm perl cmake pkg-config python3 ]; preConfigure = '' diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix index c33f3a873a6..38c501a8287 100644 --- a/pkgs/development/libraries/libaosd/default.nix +++ b/pkgs/development/libraries/libaosd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cairo, pango, +{ stdenv, fetchFromGitHub, pkg-config, cairo, pango, libX11, libXcomposite, autoconf, automake }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1cn7k0n74p6jp25kxwcyblhmbdvgw3mikvj0m2jh4c6xccfrgb9a"; }; - nativeBuildInputs = [ autoconf automake pkgconfig ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ cairo pango libX11 libXcomposite ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 7a7ad22756c..469235e2e6a 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -1,7 +1,7 @@ # TODO: Resolve the issues with the Mono bindings. { stdenv, fetchgit, lib -, pkgconfig, autoreconfHook +, pkg-config, autoreconfHook , glib, dbus-glib, gtkVersion ? "3" , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "0xjvbl4gn7ra2fs6gn2g9s787kzb5cg9hv79iqsz949rxh4iw32d"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection gtk-doc ]; + nativeBuildInputs = [ pkg-config autoreconfHook vala gobject-introspection gtk-doc ]; propagatedBuildInputs = if gtkVersion == "2" diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 787745a6bda..6bc2ddb7d13 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,5 +1,5 @@ { - fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, + fetchFromGitHub, stdenv, pkg-config, autoreconfHook, acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd, # Optional but increases closure only negligibly. Also, while libxml2 @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isUnix sharutils ++ [ zlib bzip2 openssl xz lzo zstd ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] ++ stdenv.lib.optional xarSupport libxml2; - # Without this, pkgconfig-based dependencies are unhappy + # Without this, pkg-config-based dependencies are unhappy propagatedBuildInputs = stdenv.lib.optionals stdenv.isLinux [ attr acl ]; configureFlags = stdenv.lib.optional (!xarSupport) "--without-xml2"; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 9d8cf7434c2..031d36b58a8 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yasm +{ stdenv, fetchurl, pkg-config, yasm , freetype, fribidi, harfbuzz , encaSupport ? true, enca ? null # enca support , fontconfigSupport ? true, fontconfig ? null # fontconfig support @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { (mkFlag largeTilesSupport "large-tiles") ]; - nativeBuildInputs = [ pkgconfig yasm ]; + nativeBuildInputs = [ pkg-config yasm ]; buildInputs = [ freetype fribidi harfbuzz ] ++ optional encaSupport enca diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index dfe2dd76ef7..8dae2f92b4d 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig }: +, pkg-config }: stdenv.mkDerivation rec { pname = "libast"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { description = "Library of Assorted Spiffy Things"; diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index ad33c624b14..a1ee01100b4 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus-glib }: +{ stdenv, fetchurl, pkg-config, glib, dbus-glib }: stdenv.mkDerivation rec { name = "libaudclient-3.5-rc2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib dbus-glib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 15b6a275214..a712678b793 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib, perl, bash +{ stdenv, fetchurl, pkg-config, yasm, bzip2, zlib, perl, bash , mp3Support ? true, lame ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null @@ -81,7 +81,7 @@ let "--enable-cross-compile" ]; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ lame yasm zlib bzip2 SDL bash ] ++ [ perl ] # for install-man target ++ optional mp3Support lame diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix index 01f39052e93..61bc655931f 100644 --- a/pkgs/development/libraries/libavc1394/default.nix +++ b/pkgs/development/libraries/libavc1394/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libraw1394 }: +{ stdenv, fetchurl, pkg-config, libraw1394 }: stdenv.mkDerivation rec { name = "libavc1394-0.5.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lsv46jdqvdx5hx92v0z2cz3yh6212pz9gk0k3513sbaa04zzcbw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libraw1394 ]; meta = { diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 39646db87ec..1ea610883b5 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, gtk-doc +{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc , docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted , cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key , libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - autoreconfHook pkgconfig gtk-doc libxslt docbook_xsl docbook_xml_dtd_43 + autoreconfHook pkg-config gtk-doc libxslt docbook_xsl docbook_xml_dtd_43 python3 gobject-introspection autoconf-archive makeWrapper ]; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index a00e2272d66..948b48b192d 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook, DiskArbitration +{ stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration , withJava ? false, jdk ? null, ant ? null , withAACS ? false, libaacs ? null , withBDplus ? false, libbdplus ? null @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { patches = optional withJava ./BDJ-JARFILE-path.patch; - nativeBuildInputs = [ pkgconfig autoreconfHook ] + nativeBuildInputs = [ pkg-config autoreconfHook ] ++ optionals withJava [ ant ] ; diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index c93a59d462f..f972feacda3 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext , gtk-doc, libxslt, docbook_xml_dtd_43, docbook_xsl , python3, pcre2, gmp, mpfr }: @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig gettext gtk-doc libxslt docbook_xml_dtd_43 docbook_xsl python3 ]; + nativeBuildInputs = [ autoreconfHook pkg-config gettext gtk-doc libxslt docbook_xml_dtd_43 docbook_xsl python3 ]; buildInputs = [ pcre2 gmp mpfr ]; diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 84df50e117a..642b0a27aa6 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, zlib, pkgconfig, imlib2 +{ stdenv, fetchurl, ncurses, zlib, pkg-config, imlib2 , x11Support ? !stdenv.isDarwin, libX11, libXext }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ] + propagatedBuildInputs = [ ncurses zlib pkg-config (imlib2.override { inherit x11Support; }) ] ++ stdenv.lib.optionals x11Support [ libX11 libXext ]; postInstall = '' diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix index 474e51e8c46..8ba9e34c9d3 100644 --- a/pkgs/development/libraries/libcacard/default.nix +++ b/pkgs/development/libraries/libcacard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, nss }: +{ stdenv, fetchurl, pkg-config, glib, nss }: stdenv.mkDerivation rec { pname = "libcacard"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0vyvkk4b6xjwq1ccggql13c1x7g4y90clpkqw28257azgn2a1c8n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib nss ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 9dea5956d65..fb806aa2496 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libtool +{ stdenv, lib, fetchurl, fetchpatch, pkg-config, libtool , gtk ? null , libpulseaudio, gst_all_1, libvorbis, libcap , CoreServices @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2"; }; - nativeBuildInputs = [ pkgconfig libtool ]; + nativeBuildInputs = [ pkg-config libtool ]; buildInputs = [ libpulseaudio libvorbis gtk ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]) diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index b71b630675d..ca50126971b 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }: +{ stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }: stdenv.mkDerivation rec { pname = "libcangjie"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0i5svvcx099fc9hh5dvr3gpb1041v6vn5fnylxy82zjy239114lg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool m4 sqlite ]; configureScript = "./autogen.sh"; diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index 8ad3231dc36..92820772619 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig, +{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkg-config, libiconv, IOKit, DiskArbitration}: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1wjgmmaca4baw7k5c3vdap9hnjc49ciagi5kvpvync3aqfmdvkha"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libcdio ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ]; diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index b0b7b55a19d..e7705362894 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv, Carbon, IOKit }: +{ stdenv, fetchurl, libcddb, pkg-config, ncurses, help2man, libiconv, Carbon, IOKit }: stdenv.mkDerivation rec { name = "libcdio-2.1.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - nativeBuildInputs = [ pkgconfig help2man ]; + nativeBuildInputs = [ pkg-config help2man ]; buildInputs = [ libcddb ncurses ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ]; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 72996e28996..20f45bc1bce 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost, cppunit }: +{ stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: stdenv.mkDerivation rec { name = "libcdr-0.1.6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 792d899333e..e8c649c9660 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform, libraspberrypi ? null }: +{ stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }: let version = "4.0.7"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0nii8qh3qrn92g8x3canj4glb2bjn6gc1p3f6hfp59ckd4vjrndw"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ udev libcec_platform ] ++ stdenv.lib.optional (libraspberrypi != null) libraspberrypi; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 6a74941a3a0..adf85428eea 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkgconfig, glib, gtk3, cairo, sqlite, gnome3 +{ fetchurl, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome3 , clutter-gtk, libsoup, gobject-introspection /*, libmemphis */ }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ sqlite libsoup ]; diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index d2040b72311..6e8ed7a04a2 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, zlib, bzip2, libgcrypt , gdbm, gperf, tdb, gnutls, db, libuuid -, lzo, pkgconfig, guile, rpcsvc-proto, libtirpc +, lzo, pkg-config, guile, rpcsvc-proto, libtirpc }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./gets-undeclared.patch ./size_t.patch ./0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch ]; - nativeBuildInputs = [ pkgconfig gperf rpcsvc-proto ]; + nativeBuildInputs = [ pkg-config gperf rpcsvc-proto ]; NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-ltirpc" ]; diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix index 87c86ea2fbe..37f77bb0d76 100644 --- a/pkgs/development/libraries/libcloudproviders/default.nix +++ b/pkgs/development/libraries/libcloudproviders/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }: +{ stdenv, fetchurl, meson, ninja, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }: # TODO: Add installed tests once https://gitlab.gnome.org/World/libcloudproviders/issues/4 is fixed @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "-Denable-gtk-doc=true" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl ]; buildInputs = [ glib ]; diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index b086dfc08f6..c02a913613d 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkgconfig }: +{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkg-config }: stdenv.mkDerivation rec { pname = "libclxclient"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libclthreads libX11 libXft xorg.xorgproto ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; NIX_CFLAGS_COMPILE = "-I${xorg.xorgproto}/include -I${libXft.dev}/include"; diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index 8b1093ac21f..1a97e544bb2 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, libxml2, pkgconfig, docbook2x, curl, autoreconfHook, cppunit }: +{ stdenv, fetchFromGitHub, boost, libxml2, pkg-config, docbook2x, curl, autoreconfHook, cppunit }: stdenv.mkDerivation rec { pname = "libcmis"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0s6prfh55hn11vrs72ph1gs01v0vngly81pvyjm5v1sgwymdxx57"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig docbook2x ]; + nativeBuildInputs = [ autoreconfHook pkg-config docbook2x ]; buildInputs = [ boost libxml2 curl cppunit ]; configureFlags = [ diff --git a/pkgs/development/libraries/libco-canonical/default.nix b/pkgs/development/libraries/libco-canonical/default.nix index 56974fcca7b..689fbbb65bf 100644 --- a/pkgs/development/libraries/libco-canonical/default.nix +++ b/pkgs/development/libraries/libco-canonical/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig }: +{ stdenv, fetchFromGitHub, pkg-config }: with stdenv.lib; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0r5b1r0sxngx349s5a3zkkvfw5by9y492kr34b25gjspzvjchlxq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 92b000bc4ef..aab90f8e37f 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libevent, openssl}: +{ stdenv, fetchFromGitHub, cmake, pkg-config, libevent, openssl}: stdenv.mkDerivation rec { pname = "libcouchbase"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libevent openssl ]; # Running tests in parallel does not work diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index df1558a1e49..6a9b87d00d9 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: +{ stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: stdenv.mkDerivation rec { pname = "libcryptui"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ./fix-gnupg-2.2.patch # based on https://gitlab.gnome.org/GNOME/libcryptui/-/commit/b05e301d1b264a5d8f07cb96e5edc243d99bff79.patch ]; - nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; + nativeBuildInputs = [ pkg-config intltool autoreconfHook ]; buildInputs = [ glib gtk3 gnupg22 gpgme dbus-glib libgnome-keyring ]; propagatedBuildInputs = [ dbus-glib ]; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 6c430682251..a4cc7d96593 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobject-introspection, libxml2 +{ stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome3 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "13v7s46cgw135ycx0byn7am4inn33slrhljq0v0wwfwl2y1g52p1"; }; - nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ]; + nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ]; buildInputs = [ glib gtk3 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 5e11864b1f1..8e9fe4de88a 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, file -, pkgconfig, intltool +, pkg-config, intltool , glib, dbus-glib, json-glib , gobject-introspection, vala , gtkVersion ? null, gtk2 ? null, gtk3 ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"; }; - nativeBuildInputs = [ vala pkgconfig intltool gobject-introspection ]; + nativeBuildInputs = [ vala pkg-config intltool gobject-introspection ]; buildInputs = [ glib dbus-glib json-glib diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix index 6c2f3b8e107..a398a6fab72 100644 --- a/pkgs/development/libraries/libde265/default.nix +++ b/pkgs/development/libraries/libde265/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { version = "1.0.8"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1dzflqbk248lz5ws0ni5acmf32b3rmnq5gsfaz7691qqjxkl1zml"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 5d00d6b01ff..b674087c759 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL -, libX11, pkgconfig, OpenGL +, libX11, pkg-config, OpenGL }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr libGL libX11 ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = [ "--enable-ILU" "--enable-ILUT" ]; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index d966631dc27..ad0f5f50bf2 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl -, xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }: +, xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { version = "3.14.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1x72icq5lp5cfv6kyxqc3863wa164s0g41nbi6gldr8syprzdk1l"; }; - nativeBuildInputs = [ cmake pkgconfig xxd ]; + nativeBuildInputs = [ cmake pkg-config xxd ]; buildInputs = [ libdigidoc minizip pcsclite opensc openssl xercesc diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index 698aac87b89..1ecb1f3d572 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, cmake, pkgconfig, darwin }: +{ stdenv, fetchurl, cmake, pkg-config, darwin }: stdenv.mkDerivation rec { pname = "libdiscid"; version = "0.6.2"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index 0bdf3fbe15a..bd23b6831a0 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig }: +{ stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { name = "libdmtx-0.7.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = { description = "An open source software for reading and writing Data Matrix barcodes"; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index b9825d9cfdf..3b5daad854c 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess +{ stdenv, lib, fetchurl, pkg-config, meson, ninja, libpthreadstubs, libpciaccess , withValgrind ? valgrind-light.meta.available, valgrind-light, fetchpatch }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "bin" ]; - nativeBuildInputs = [ pkgconfig meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ libpthreadstubs libpciaccess ] ++ lib.optional withValgrind valgrind-light; diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix index c8ebf180b31..f5264587a16 100644 --- a/pkgs/development/libraries/libdvdnav/4.2.1.nix +++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libdvdread}: +{stdenv, fetchurl, pkg-config, libdvdread}: stdenv.mkDerivation { name = "libdvdnav-4.2.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libdvdread]; configureScript = "./configure2"; # wtf? diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 2afc11c6009..5f26b943537 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libdvdread}: +{stdenv, fetchurl, pkg-config, libdvdread}: stdenv.mkDerivation rec { pname = "libdvdnav"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0nzf1ir27s5vs1jrisdiw9ag2sc160k3gv7nplv9ypppm5gb35zn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libdvdread]; meta = { diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix index 805b1869ac3..96b341dceae 100644 --- a/pkgs/development/libraries/libe-book/default.nix +++ b/pkgs/development/libraries/libe-book/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu +{ stdenv, fetchurl, gperf, pkg-config, librevenge, libxml2, boost, icu , cppunit, zlib, liblangtag }: @@ -13,7 +13,7 @@ let sha256="1yg1vws1wggzhjw672bpgh2x541g5i9wryf67g51m0r79zrqz3by"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gperf librevenge libxml2 boost icu cppunit zlib liblangtag ]; diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 29c4b4c3b09..4d8d2c10b67 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libebml"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "052v4mjynndj9xgfl4lmlsnx9ai0pah0kjyr5fm34l7gj8vhc5s7"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=YES" diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index 36d88f88786..e8ffa37379e 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libestr }: +{ stdenv, fetchurl, pkg-config, libestr }: stdenv.mkDerivation { name = "libee-0.4.1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "09xhgzmsq0g3jsyj24vy67bhzk2fv971w5ixdkhfwgar70cw1nn0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libestr]; meta = { diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index b8b28f49d1d..54520116129 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }: +{ stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }: let avahiWithGtk = avahi.override { gtk3Support = true; }; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool gtk-doc ]; diff --git a/pkgs/development/libraries/libevdevplus/default.nix b/pkgs/development/libraries/libevdevplus/default.nix index 0f2b3e05266..d094bc35142 100644 --- a/pkgs/development/libraries/libevdevplus/default.nix +++ b/pkgs/development/libraries/libevdevplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libevdevplus"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "18z6pn4j7fhmwwh0q22ip5nn7sc1hfgwvkdzqhkja60i8cw2cvvj"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index ff644599b8a..759c0e40adc 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zlib, openssl, libuuid, pkgconfig }: +{ fetchurl, stdenv, zlib, openssl, libuuid, pkg-config }: stdenv.mkDerivation rec { version = "20201129"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "168k1az9hm0lajh57zlbknsq5m8civ1rzp81zz4sd7v64xilzxdk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib openssl libuuid ]; meta = { diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index f7e9606bbe7..68c4fe807b3 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, substituteAll , libtool, gettext, zlib, bzip2, flac, libvorbis -, exiv2, libgsf, rpm, pkgconfig, fetchpatch +, exiv2, libgsf, rpm, pkg-config, fetchpatch , gstreamerSupport ? true, gst_all_1 ? null # ^ Needed e.g. for proper id3 and FLAC support. # Set to `false` to decrease package closure size by about 87 MB (53%). @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool gettext zlib bzip2 flac libvorbis exiv2 libgsf rpm - pkgconfig + pkg-config ] ++ stdenv.lib.optionals gstreamerSupport ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ] diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index f95d150cc25..4e7cc1df069 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xorgproto }: +{ stdenv, fetchurl, libX11, libXi, libXtst, pkg-config, xorgproto }: stdenv.mkDerivation rec { pname = "libfakekey"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXi libXtst xorgproto ]; NIX_LDFLAGS = "-lX11"; diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index 48b457b09de..75b483de6ac 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , cmake -, pkgconfig +, pkg-config , hidapi , libcbor , openssl @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "08iizxq3w8mpkwfrfpl59csffc20yz8x398bl3kf23rrr4izk42r"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ hidapi libcbor openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ udev ]; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index e5b76b1435f..c9be4c6ba7f 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -4,7 +4,7 @@ , gettext , gnutls , nettle -, pkgconfig +, pkg-config , libiconv , ApplicationServices }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0akvki7n5rwmc52wss25i3h4nwl935flhjypf8dx3lvf4jszxxiv"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gettext gnutls nettle ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/development/libraries/libfishsound/default.nix index 23d828033e3..6b931105415 100644 --- a/pkgs/development/libraries/libfishsound/default.nix +++ b/pkgs/development/libraries/libfishsound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libvorbis, speex, flac, pkgconfig }: +{ stdenv, fetchurl, libvorbis, speex, flac, pkg-config }: stdenv.mkDerivation rec { name = "libfishsound-1.0.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libvorbis speex flac ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { homepage = "https://xiph.org/fishsound/"; diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 2670f94fbc2..0f6ad84fe75 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , cmake , ninja -, pkgconfig +, pkg-config , eigen , zlib , libpng @@ -23,7 +23,7 @@ mkDerivation { sha256 = "102zw2n3vzv84i323is4qrwwqqha8v1cniw54ss8f4bq6dmic0bg"; }; - nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkgconfig ]; + nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ]; buildInputs = [ eigen zlib libpng boost guile ]; # Link "Studio" binary to "libfive-studio" to be more obvious: diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index 4fdb22f8bd4..2c0ba2dcc3c 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "libfixposix"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1x4q6yspi5g2s98vq4qszw4z3zjgk9l5zs8471w4d4cs6l97w08j"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with stdenv.lib; { homepage = "https://github.com/sionescu/libfixposix"; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 94476984de0..163a633df5c 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkgconfig, vala +{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkg-config, vala , extraOnly ? false , withGtk3 ? false, gtk2, gtk3 }: let @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn"; }; - nativeBuildInputs = [ vala pkgconfig intltool ]; + nativeBuildInputs = [ vala pkg-config intltool ]; buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache; configureFlags = [ diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 11051f70e44..2464679ac8a 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchFromGitLab -, pkgconfig +, pkg-config , meson , ninja , gusb @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gtk-doc diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index 4af7d44a294..d9c0e10dad6 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libnfc, openssl +{ stdenv, fetchurl, pkg-config, libnfc, openssl , libobjc ? null }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnfc openssl ] ++ stdenv.lib.optional stdenv.isDarwin libobjc; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/development/libraries/libfsm/default.nix index e1c7f892aab..5edfd622347 100644 --- a/pkgs/development/libraries/libfsm/default.nix +++ b/pkgs/development/libraries/libfsm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - # fix up multi-output install. we also have to fix the pkgconfig libdir + # fix up multi-output install. we also have to fix the pkg-config libdir # file; it uses prefix=$out; libdir=${prefix}/lib, which is wrong in # our case; libdir should really be set to the $lib output. postInstall = '' diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 0e2e24d0f3b..6c128e2947f 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, libusb1, libconfuse +{ stdenv, fetchurl, cmake, pkg-config, libusb1, libconfuse , cppSupport ? true, boost ? null , pythonSupport ? true, python3 ? null, swig ? null , docSupport ? true, doxygen ? null @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = with stdenv.lib; [ libconfuse ] ++ optionals cppSupport [ boost ] ++ optionals pythonSupport [ python3 swig ] diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix index b3d58c446cf..2d79a1b64dc 100644 --- a/pkgs/development/libraries/libgaminggear/default.nix +++ b/pkgs/development/libraries/libgaminggear/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gettext +{ stdenv, fetchurl, cmake, pkg-config, gettext , gtk2, libcanberra, libnotify, pcre, sqlite, xorg , harfbuzz }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" "bin" ]; - nativeBuildInputs = [ cmake pkgconfig gettext ]; + nativeBuildInputs = [ cmake pkg-config gettext ]; propagatedBuildInputs = [ gtk2 libcanberra libnotify pcre sqlite xorg.libXdmcp xorg.libpthreadstubs diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index be3e2e469ad..ea0484f710e 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glibmm, libgda, libxml2, gnome3 +{ stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome3 , mysqlSupport ? false , postgresSupport ? false }: @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { sha256 = "1fyh15b3f8hmwbswalxk1g4l04yvvybksn5nm7gznn5jl5q010p9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glibmm libxml2 ]; propagatedBuildInputs = [ gda ]; diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 50eac405706..9c8ea6bb1c0 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , meson , ninja , nixosTests @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 70043d1132d..4a518818e8b 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, glib, cairo, Carbon, fontconfig +{ stdenv, fetchFromGitHub, pkg-config, glib, cairo, Carbon, fontconfig , libtiff, giflib, libjpeg, libpng , libXrender, libexif, autoreconfHook, fetchpatch }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = stdenv.lib.optional stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}"; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index c2d1c197fe9..a531a433a88 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobject-introspection, gnome3 }: +{ stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "libgee"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; - nativeBuildInputs = [ pkgconfig autoconf vala gobject-introspection ]; + nativeBuildInputs = [ pkg-config autoconf vala gobject-introspection ]; buildInputs = [ glib ]; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix index cf62e0cabc9..abd73ea5b75 100644 --- a/pkgs/development/libraries/libgepub/default.nix +++ b/pkgs/development/libraries/libgepub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, gnome3 +{ stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome3 , webkitgtk, libsoup, libxml2, libarchive }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { doCheck = true; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ]; buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ]; passthru = { diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 84d44969a14..baa9917cad2 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }: +{ stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkg-config, libuuid }: stdenv.mkDerivation rec { pname = "libgig"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1zs5yy124bymfyapsnljr6rv2lnn5inwchm0xnwiw44b2d39l8hn"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ libsndfile libuuid ]; diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index 9a05a01bee6..b07b5b91249 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, vala, libssh2 +{ stdenv, fetchurl, gnome3, meson, ninja, pkg-config, vala, libssh2 , gtk-doc, gobject-introspection, libgit2, glib, python3 }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig vala gtk-doc gobject-introspection + meson ninja pkg-config vala gtk-doc gobject-introspection ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 9ead3a97c04..8c9905a4287 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3, +{ stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome3, libstartup_notification, libgtop, perlPackages, autoreconfHook, intltool, docbook_xsl, xauth }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig autoreconfHook intltool docbook_xsl wrapGAppsHook + pkg-config autoreconfHook intltool docbook_xsl wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 3a4737d483b..92783d3ae0c 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python3, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python3, pkg-config, libX11, libXext, xorgproto, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "libglvnd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "10x7fgb114r4gikdg6flszl3kwzcb9y5qa7sj9936mk0zxhjaylz"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig python3 addOpenGLRunpath ]; + nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; buildInputs = [ libX11 libXext xorgproto ]; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index 33a6a075ae4..fbb2499f24a 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool }: +{ stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool }: stdenv.mkDerivation rec { pname = "libgnome-keyring"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; propagatedBuildInputs = [ glib dbus libgcrypt ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; meta = { inherit (glib.meta) platforms maintainers; diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index c02fd503eb0..17adb362cdb 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }: +{ stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { pname = "libgnomekbd"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ file intltool - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 5daeba2c06e..e7e16d769e7 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, groff, perl, pkgconfig, python2, zlib, gnutls, +{ stdenv, fetchurl, libtool, groff, perl, pkg-config, python2, zlib, gnutls, libidn2, libunistring, nghttp2 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1y4laraq37kw8hc8jlzgcw7y37bfd0n71q0sy3d3z6yg7zh2prxi"; }; - nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; + nativeBuildInputs = [ libtool groff perl pkg-config python2 ]; buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ]; diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 89bca2ee75f..db9e03a045a 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext , libusb1 , libtool , libexif @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config gettext libtool ]; diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index a3178e54804..8f6d9fcab5e 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkgconfig, kmod +{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config, kmod , enable-tools ? true , enablePython ? false, python3, ncurses }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; nativeBuildInputs = [ autoconf-archive - pkgconfig + pkg-config autoreconfHook ]; diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix index 323f5af7097..102361e5fb2 100644 --- a/pkgs/development/libraries/libgringotts/default.nix +++ b/pkgs/development/libraries/libgringotts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, zlib, bzip2, libmcrypt, libmhash }: +{ stdenv, fetchurl, pkg-config, zlib, bzip2, libmcrypt, libmhash }: stdenv.mkDerivation rec { pname = "libgringotts"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1ldz1lyl1aml5ci1mpnys8dg6n7khpcs4zpycak3spcpgdsnypm7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib bzip2 libmcrypt libmhash ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index fdad5369813..132fc6a8712 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }: +{ stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }: let version = "0.7.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7"; }; - nativeBuildInputs = [ pkgconfig vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + nativeBuildInputs = [ pkg-config vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ glib libxml2 libsoup ]; configureFlags = [ diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 34cb1ef3381..bdc024094c0 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 +{ fetchurl, stdenv, pkg-config, intltool, gettext, glib, libxml2, zlib, bzip2 , perl, gdk-pixbuf, libiconv, libintl, gnome3 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"; }; - nativeBuildInputs = [ pkgconfig intltool libintl ]; + nativeBuildInputs = [ pkg-config intltool libintl ]; buildInputs = [ gettext bzip2 zlib ]; checkInputs = [ perl ]; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index 65f5e2750e5..165b8018443 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , glib -, pkgconfig +, pkg-config , perl , gettext , gobject-introspection @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gtk-doc perl gettext diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index c7c3064acb8..d1ddf3812c0 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , udev , glib , gobject-introspection @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0drf39qhsdz35kwb18hnfj2ig4yfxhfks66m783zlhnvy2narbhv"; }; - nativeBuildInputs = [ pkgconfig gobject-introspection ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; buildInputs = [ udev glib ]; # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway. diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index d6e45deadcf..ccc2778c0c0 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper +{ stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper , ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db , gmp, readline, file, numactl, libapparmor, jansson @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "ad6562c48c38e922a314cb45a90996843d81045595c4917f66b02a6c2dfe8058"; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; buildInputs = [ ncurses cpio gperf jansson cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 5493343fc23..80f897a1a53 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, libxml2, glib, gtk3, gettext, libsoup +{ stdenv, fetchurl, meson, ninja, pkg-config, libxml2, glib, gtk3, gettext, libsoup , gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, python3, tzdata, geocode-glib, vala, gnome3 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0l74hc02rvzm4p530y539a67jwb080fqdaazdl8j0fr3xvq0j9yy"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; + nativeBuildInputs = [ meson ninja pkg-config gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; buildInputs = [ glib gtk3 libsoup libxml2 geocode-glib ]; postPatch = '' diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index 095b5c8f61c..c5289829851 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, cairo +{ stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, cairo , libarchive, freetype, libjpeg, libtiff, gnome3, lcms2 }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs"; }; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ]; buildInputs = [ glib cairo freetype libjpeg libtiff lcms2 ]; propagatedBuildInputs = [ libarchive ]; diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix index 9cf4f615dd2..5a7ab456acc 100644 --- a/pkgs/development/libraries/libhandy/0.x.nix +++ b/pkgs/development/libraries/libhandy/0.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala +{ stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 , gtk3, gnome3 , dbus, xvfb_run, libxml2 @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gobject-introspection vala libxml2 + meson ninja pkg-config gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ gnome3.gnome-desktop gtk3 libxml2 ]; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 7dce08b4cc2..1e4fd3348f1 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , vala , gtk-doc @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala ]; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { "-Dgtk_doc=true" ]; - # Uses define_variable in pkgconfig, but we still need it to use the glade output + # Uses define_variable in pkg-config, but we still need it to use the glade output PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 4a5f6ab3bd8..ca8c189a9c8 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libde265, x265, libpng, libjpeg, libaom }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0hjs1i076jmy4ryj8y2zs293wx53kzg38y8i42cbcsqydvsdp6hz"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libde265 x265 libpng libjpeg libaom ]; # TODO: enable dav1d and rav1e codecs when libheif can find them via pkg-config diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 2de7e08fb02..f4edb39af5d 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala, fetchpatch +{ stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch , gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }: let @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w"; }; - nativeBuildInputs = [ vala gobject-introspection meson ninja pkgconfig ]; + nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ]; buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ]; # Fixes build with vala >=0.42 diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index c03367da97b..7802f975202 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -9,7 +9,7 @@ , libxml2 , ninja , perl -, pkgconfig +, pkg-config , libical , python3 , tzdata @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cmake ninja perl - pkgconfig + pkg-config # Docs building fails: # https://github.com/NixOS/nixpkgs/pull/67204 # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix index 77b2424bfee..2f2d2d190e8 100644 --- a/pkgs/development/libraries/libiec61883/default.nix +++ b/pkgs/development/libraries/libiec61883/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libraw1394 }: +{ stdenv, fetchurl, pkg-config, libraw1394 }: stdenv.mkDerivation rec { version = "1.2.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "7c7879c6b9add3148baea697dfbfdcefffbc8ac74e8e6bcf46125ec1d21b373a"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libraw1394 ]; diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index a9a2fb6b4c1..f5038e45d3a 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig, gnutls +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config, gnutls , libgcrypt, libtasn1, glib, libplist, libusbmuxd }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { autoconf automake libtool - pkgconfig + pkg-config ]; propagatedBuildInputs = [ glib diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix index 8bb90180300..139672f6d80 100644 --- a/pkgs/development/libraries/libindicator/default.nix +++ b/pkgs/development/libraries/libindicator/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, file -, pkgconfig +, pkg-config , gtkVersion ? "3", gtk2 ? null, gtk3 ? null }: with lib; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ (if gtkVersion == "2" then gtk2 else gtk3) ]; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 15d9b05ebd4..b980e0a279f 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -1,6 +1,6 @@ { gtkWidgets ? false # build GTK widgets for libinfinity , avahiSupport ? false # build support for Avahi in libinfinity -, stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl +, stdenv, fetchurl, pkg-config, glib, libxml2, gnutls, gsasl , gobject-introspection , gtk3 ? null, gtk-doc, docbook_xsl, docbook_xml_dtd_412, avahi ? null, libdaemon, libidn, gss , libintl }: @@ -21,7 +21,7 @@ let outputs = [ "bin" "out" "dev" "man" "devdoc" ]; - nativeBuildInputs = [ pkgconfig gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; + nativeBuildInputs = [ pkg-config gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; buildInputs = [ glib libxml2 gsasl libidn gss libintl libdaemon ] ++ stdenv.lib.optional gtkWidgets gtk3 ++ stdenv.lib.optional avahiSupport avahi; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index dff2ca82955..cf0af9127f7 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja +{ stdenv, fetchFromGitLab, pkg-config, meson, ninja , libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "--libexecdir=${placeholder "bin"}/libexec" ]; - nativeBuildInputs = [ pkgconfig meson ninja ] + nativeBuildInputs = [ pkg-config meson ninja ] ++ optionals documentationSupport [ doxygen graphviz sphinx-build ]; buildInputs = [ diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index c80a9bb1f92..f2b7eaa8f54 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkgconfig, gtk2, Carbon +{ config, stdenv, fetchurl, pkg-config, gtk2, Carbon , useGTK ? config.libiodbc.gtk or false }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0qpvklgr1lcn5g8xbz7fbc9rldqf9r8s6xybhqj20m4sglxgziai"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = stdenv.lib.optionals useGTK [ gtk2 ] ++ stdenv.lib.optional stdenv.isDarwin Carbon; diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix index bc91593a960..26a39516d25 100644 --- a/pkgs/development/libraries/libirecovery/default.nix +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config , libusb1 , readline }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { autoconf automake libtool - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 240636d518c..4d9df889851 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libconfuse }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libconfuse }: stdenv.mkDerivation rec { pname = "libite"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kad501mrvn0s0sw9pz5spjq7ymk117hnff249z6026gswrxv1mh"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libconfuse ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index 1226d1c489e..2dc009b9b1c 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, file, protobufc }: +{ stdenv, fetchurl, autoreconfHook, pkg-config, file, protobufc }: stdenv.mkDerivation rec { pname = "libivykis"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0abi0rc3wnncvr68hy6rmzp96x6napd7fs1mff20dr8lb0jyvy3f"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ file protobufc ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index b724789188c..30342ea24c8 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext -, pkgconfig, glib, libxml2, gobject-introspection, gnome-common, unzip +, pkg-config, glib, libxml2, gobject-introspection, gnome-common, unzip }: stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common unzip ]; - nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkgconfig ]; + nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config ]; meta = { inherit version; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 830e125685e..2bf33bab416 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, cmake +{ stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, cmake , fftwSinglePrec, libsamplerate, qtbase , darwin }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "04r14prydxshjgfws3pjajjmp2msszhjjs1mjh8s66yg29vq620l"; })]; - nativeBuildInputs = [ pkgconfig which cmake ]; + nativeBuildInputs = [ pkg-config which cmake ]; buildInputs = [ fftwSinglePrec libsamplerate qtbase ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index 46152e79276..4bf8fb7bf65 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, curl, openssl }: +{ stdenv, fetchurl, pkg-config, curl, openssl }: stdenv.mkDerivation { name = "liblastfm-SF-0.5"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ curl openssl ]; diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index 82ac1b3144e..3783bd408f1 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, expat, icu }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, expat, icu }: stdenv.mkDerivation rec { pname = "liblcf"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0b0bz9ydpc98mxbg78bgf8kil85kxyqgkzxgsjq7awzmyw7f3c1c"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ expat icu ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 7d7f035f77f..5c06dea390f 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -34,7 +34,7 @@ , openldap , ortp , pango -, pkgconfig +, pkg-config , python , readline , soci @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { graphviz intltool makeWrapper - pkgconfig + pkg-config ]; # Some grammar files needed to be copied too from some dependencies. I suppose diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index b9b787f4182..5602231e34d 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkg-config , systemd ? null }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "14xz00mq07qmcgprlj5b2r21ljgpa4sbwmpr6jm2wrf8wms6331k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ systemd ]; configureFlags = [ diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index bef1048dde4..d3a6b599742 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libestr, json_c, pcre, fastJson }: +{ stdenv, fetchurl, pkg-config, libestr, json_c, pcre, fastJson }: stdenv.mkDerivation rec { name = "liblognorm-2.0.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1wpn15c617r7lfm1z9d5aggmmi339s6yn4pdz698j0r2bkl5gw6g"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libestr json_c pcre fastJson ]; configureFlags = [ "--enable-regexp" ]; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index d29cbf6a719..3e83e34ee81 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub , stdenv , autoreconfHook -, pkgconfig +, pkg-config , gettext , python3 , texinfo @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config gettext python3 # Docs, man, info diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index 5f37989c20b..936469c01c6 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib }: +{ stdenv, fetchurl, pkg-config, glib }: stdenv.mkDerivation rec { name = "liblqr-1-0.4.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0dzikxzjz5zmy3vnydh90aqk23q0qm8ykx6plz6p4z90zlp84fhp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ glib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index 101e11deaa5..4ee37dc0b9f 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig }: +{ stdenv, fetchurl, autoconf, automake, libtool, pkg-config }: stdenv.mkDerivation rec { pname = "liblscp"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rl7ssdzj0z3658yvdijmb27n2lcwmplx4qxg5mwrm07pvs7i75k"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; preConfigure = "make -f Makefile.git"; diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 0cb233ad271..96593fb50bf 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -2,7 +2,7 @@ , fetchurl , ninja , meson -, pkgconfig +, pkg-config , vala , gobject-introspection , gtk-doc @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala gobject-introspection gtk-doc diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index a24b931c660..b794c1f7217 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, guile, autoconf, flex, fetchpatch }: +{ stdenv, fetchurl, pkg-config, guile, autoconf, flex, fetchpatch }: stdenv.mkDerivation rec { version = "1.1.11"; pname = "libmatheval"; - nativeBuildInputs = [ pkgconfig autoconf flex ]; + nativeBuildInputs = [ pkg-config autoconf flex ]; buildInputs = [ guile ]; src = fetchurl { diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 5d065636a92..ab8107b39c4 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkg-config , libebml }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0yhr9hhgljva1fx3b0r4s3wkkypdfgsysbl35a4g3krkbhaa9rsd"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libebml ]; diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index 38adebb2a48..1007123619f 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }: +{ stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }: stdenv.mkDerivation rec { pname = "libmediaart"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"; }; - nativeBuildInputs = [ meson ninja pkgconfig vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; buildInputs = [ glib gdk-pixbuf ]; patches = [ diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 31d64101e6b..0974371c41e 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: +{ stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: stdenv.mkDerivation rec { version = "20.09"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "15ni9pnch6688m72swwax109a7mg4a08yx75qknrx7qa6dbyhz6h"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libzen zlib ]; sourceRoot = "./MediaInfoLib/Project/GNU/Library/"; diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/pkgs/development/libraries/libmicrodns/default.nix index 69dd052dc03..5bed556a273 100644 --- a/pkgs/development/libraries/libmicrodns/default.nix +++ b/pkgs/development/libraries/libmicrodns/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmicrohttpd/generic.nix b/pkgs/development/libraries/libmicrohttpd/generic.nix index 9b817f21b94..99407d22b75 100644 --- a/pkgs/development/libraries/libmicrohttpd/generic.nix +++ b/pkgs/development/libraries/libmicrohttpd/generic.nix @@ -1,11 +1,11 @@ -{ stdenv, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl, version, src }: +{ stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src }: stdenv.mkDerivation rec { pname = "libmicrohttpd"; inherit version src; outputs = [ "out" "dev" "devdoc" "info" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgcrypt curl gnutls libiconv libintl ]; preCheck = '' diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix index 3753101ebf9..a56b18fe199 100644 --- a/pkgs/development/libraries/libmms/default.nix +++ b/pkgs/development/libraries/libmms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig }: +{ stdenv, fetchurl, glib, pkg-config }: stdenv.mkDerivation rec { name = "libmms-0.6.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { description = "Library for downloading (streaming) media files using the mmst and mmsh protocols"; diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/development/libraries/libmodule/default.nix index d608a08d2d9..94632ed57b0 100644 --- a/pkgs/development/libraries/libmodule/default.nix +++ b/pkgs/development/libraries/libmodule/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, cmake, pkgconfig }: +, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libmodule"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix index b3231d1af91..f07dbd84a95 100644 --- a/pkgs/development/libraries/libmongo-client/default.nix +++ b/pkgs/development/libraries/libmongo-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib }: stdenv.mkDerivation rec { name = "libmongo-client-0.1.8"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1cjx06i3gd9zkyvwm2ysjrf0hkhr7bjg3c27s7n0y31j10igfjp0"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ]; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index aa70e4c4ddf..fbd7cbe7ad6 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, curl, libnxml, pkgconfig}: +{stdenv, fetchurl, curl, libnxml, pkg-config}: stdenv.mkDerivation { name = "libmrss-0.19.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "02r1bgj8qlkn63xqfi5yq8y7wrilxcnkycaag8qskhg5ranic507"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ curl libnxml ]; meta = { diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index e9cfd0f9856..bbc3e949053 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkgconfig +{ stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkg-config , libusb1 , libiconv }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { automake gettext libtool - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index 2ab23015af3..1889fc1508f 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}: +{stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}: let s = # Generated upstream information rec { @@ -10,7 +10,7 @@ let sha256="074ipcq9w7jbd5x316dzclddgia2ydw098ph9d7p3d713pmkf5cf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost cppunit zlib libwpg libwpd librevenge ]; diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 623c872fa1a..ace5503b657 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, libtool, pkgconfig, automake, autoconf, intltool +, libtool, pkg-config, automake, autoconf, intltool , glib, gobject-introspection, gtk2, gtk-doc , clutter, clutter-gtk }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { configureScript = "sh autogen.sh"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool intltool diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index 074e3842933..d3e0ff53528 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -6,7 +6,7 @@ , intltool , json_c , libtool -, pkgconfig +, pkg-config , python3 }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { automake intltool libtool - pkgconfig + pkg-config python3 ]; diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 6ca6c301831..aac9f8e8acf 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook -, asciidoctor, pkgconfig, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt +, asciidoctor, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , json_c, kmod, which, util-linux, udev, keyutils }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" "dev" ]; nativeBuildInputs = - [ autoreconfHook asciidoctor pkgconfig xmlto docbook_xml_dtd_45 docbook_xsl libxslt + [ autoreconfHook asciidoctor pkg-config xmlto docbook_xml_dtd_45 docbook_xsl libxslt which ]; diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix index 268da3813e7..98d89d67ef6 100644 --- a/pkgs/development/libraries/libnetfilter_acct/default.nix +++ b/pkgs/development/libraries/libnetfilter_acct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmnl }: +{ stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { version = "1.0.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "06lsjndgfjsgfjr43px2n2wk3nr7whz6r405mks3887y7vpwwl22"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 851357f6404..a97e77c5334 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }: +{ stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_conntrack"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl ]; propagatedBuildInputs = [ libnfnetlink ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { description = "Userspace library providing an API to the in-kernel connection tracking state table"; diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index ca167198989..b700c0e9d9a 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmnl }: +{ stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_cthelper"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; meta = { diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix index 64bcc08ffb9..23de6481592 100644 --- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmnl }: +{ stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_cttimeout"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; meta = { diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix index 18346814750..9bec269e6ac 100644 --- a/pkgs/development/libraries/libnetfilter_log/default.nix +++ b/pkgs/development/libraries/libnetfilter_log/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }: +{ stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_log"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl ]; propagatedBuildInputs = [ libnfnetlink ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { description = "Userspace library providing interface to packets that have been logged by the kernel packet filter"; diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 7a079616627..6889f7702e6 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmnl, libnfnetlink }: +{ stdenv, fetchurl, pkg-config, libmnl, libnfnetlink }: stdenv.mkDerivation rec { version = "1.0.5"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1xdra6i4p8jkv943ygjw646qx8df27f7p5852kc06vjx608krzzr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl libnfnetlink ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 3da2ccce442..a546eeebdc5 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmnl }: +{ stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { version = "1.1.8"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "04dp797llg3cqzivwrql30wg9mfr0ngnp0v5gs7jcdmp11dzm8q4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index e7b01ca29cb..b4e1682ab7e 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -3,7 +3,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , python3 , gobject-introspection , gtk-doc @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 gobject-introspection diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index 0c38a9c17d7..497e3aa6679 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus, expat }: +{ stdenv, fetchurl, pkg-config, dbus, expat }: let version = "1.0.3"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus expat ]; doCheck = false; # fails 1 of 17 test diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix index 5741d4cb5b8..f1661f222cc 100644 --- a/pkgs/development/libraries/libnixxml/default.nix +++ b/pkgs/development/libraries/libnixxml/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoreconfHook, pkgconfig, libxml2, gd, glib, getopt, libxslt, nix }: +{ fetchFromGitHub, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }: stdenv.mkDerivation { name = "libnixxml"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-gd" "--with-glib" ]; CFLAGS = "-Wall"; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ pkgconfig libxml2 gd.dev glib getopt libxslt nix ]; + buildInputs = [ pkg-config libxml2 gd.dev glib getopt libxslt nix ]; doCheck = false; postPatch = '' ./bootstrap diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index 34d8d800c38..2675098a826 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , libxslt , docbook-xsl-ns , glib @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config libxslt docbook-xsl-ns ]; diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix index 76aa3c99e33..ab7527c7c76 100644 --- a/pkgs/development/libraries/libnsl/default.nix +++ b/pkgs/development/libraries/libnsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkg-config }: stdenv.mkDerivation rec { pname = "libnsl"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1dayj5i4bh65gn7zkciacnwv2a0ghm6nn58d78rsi4zby4lyj5w5"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libtirpc ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index c816bdc90e5..8980a145dc9 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, nss, nspr, pkgconfig }: +{ fetchurl, stdenv, nss, nspr, pkg-config }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ nss nspr ]; diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix index 1723219e859..9af9a3864d2 100644 --- a/pkgs/development/libraries/libodfgen/default.nix +++ b/pkgs/development/libraries/libodfgen/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}: +{stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}: let s = # Generated upstream information rec { @@ -9,7 +9,7 @@ let url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.7/libodfgen-0.1.7.tar.xz"; sha256="0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost cppunit zlib libwpg libwpd librevenge ]; diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 692bddeab7d..3f6b3bcd5d7 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, opensp, pkgconfig, libxml2, curl +{ stdenv, fetchFromGitHub, opensp, pkg-config, libxml2, curl , autoconf, automake, libtool, gengetopt, libiconv }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; - nativeBuildInputs = [ pkgconfig libtool autoconf automake gengetopt ]; + nativeBuildInputs = [ pkg-config libtool autoconf automake gengetopt ]; buildInputs = [ opensp libxml2 curl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; meta = { diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index 07613f0564b..687e1d9c43d 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libogg, pkgconfig }: +{ stdenv, fetchurl, libogg, pkg-config }: stdenv.mkDerivation rec { name = "liboggz-1.1.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libogg ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { homepage = "https://xiph.org/oggz/"; diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 22adceccecf..c1c41ce559f 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig }: +{stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { name = "liboil-0.3.17"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # oil-bugreport - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix" # errors diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix index 989dfc517f0..9aaf52abdf1 100644 --- a/pkgs/development/libraries/libopusenc/default.nix +++ b/pkgs/development/libraries/libopusenc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libopus }: +{ stdenv, fetchurl, pkg-config, libopus }: let version = "0.2.1"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { doCheck = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libopus ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 6e751253594..4d4ab13e8c5 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , meson , ninja , gettext @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja vala diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix index d7e83e7a9e3..80a84974b7a 100644 --- a/pkgs/development/libraries/libow/default.nix +++ b/pkgs/development/libraries/libow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, libtool }: +{ stdenv, fetchFromGitHub, autoconf, automake, pkg-config, libtool }: stdenv.mkDerivation rec { version = "3.2p4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0dln1ar7bxwhpi36sccmpwapy7iz4j097rbf02mgn42lw5vrcg3s"; }; - nativeBuildInputs = [ autoconf automake pkgconfig ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; meta = with stdenv.lib; { description = "1-Wire File System full library"; diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index a1e6d05440c..26a95090ef6 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkg-config , openssl }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "--with-enginesdir=${placeholder "out"}/lib/engines" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; + nativeBuildInputs = [ autoreconfHook pkg-config libtool ]; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 9447b83af17..f8e9d6e4a0b 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsigcxx }: +{ stdenv, fetchurl, pkg-config, libsigcxx }: let version = "0.4"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsigcxx ]; patches = [ ./libpar2-0.4-external-verification.patch ]; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 604fd3ee446..2999b3d3172 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, bluez, pkgconfig, withBluez ? false }: +{ stdenv, fetchurl, flex, bison, bluez, pkg-config, withBluez ? false }: with stdenv.lib; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ flex bison ] - ++ optionals withBluez [ bluez.dev pkgconfig ]; + ++ optionals withBluez [ bluez.dev pkg-config ]; # We need to force the autodetection because detection doesn't # work in pure build environments. diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 1d360b45052..51717e84259 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3 +{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome3 , glib, gtk3, gobject-introspection, python3, ncurses }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2"; }; - nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ]; + nativeBuildInputs = [ pkg-config meson ninja gettext gobject-introspection ]; buildInputs = [ glib gtk3 ncurses python3 python3.pkgs.pygobject3 ]; propagatedBuildInputs = [ # Required by libpeas-1.0.pc diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index 918c663dfb4..0ec92b369d0 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gmock, boost, pkgconfig, protobuf, icu }: +{ stdenv, fetchFromGitHub, cmake, gmock, boost, pkg-config, protobuf, icu }: stdenv.mkDerivation rec { pname = "phonenumber"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gmock - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index 63035f74ea0..a3274fc9053 100644 --- a/pkgs/development/libraries/libpinyin/default.nix +++ b/pkgs/development/libraries/libpinyin/default.nix @@ -2,7 +2,7 @@ , autoreconfHook , glib , db -, pkgconfig +, pkg-config }: let @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { tar -xzf ${modelData} -C $sourceRoot/data ''; - nativeBuildInputs = [ autoreconfHook glib db pkgconfig ]; + nativeBuildInputs = [ autoreconfHook glib db pkg-config ]; meta = with stdenv.lib; { description = "Library for intelligent sentence-based Chinese pinyin input method"; diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 1f311dda9f0..447440b9c76 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig, enablePython ? false, python, glib }: +{ stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python, glib }: stdenv.mkDerivation rec { pname = "libplist"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = ["bin" "dev" "out" ] ++ stdenv.lib.optional enablePython "py"; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook ] ++ stdenv.lib.optionals enablePython [ python diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix index 0f31115f50f..6f706634391 100644 --- a/pkgs/development/libraries/libportal/default.nix +++ b/pkgs/development/libraries/libportal/default.nix @@ -3,7 +3,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_45 @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gtk-doc docbook-xsl-nons docbook_xml_dtd_45 diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 7fcc8c58c1c..4876de5551d 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , cmake , zlib , fetchpatch @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "py3" ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake makeWrapper ]; diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix index e08feaddc60..d5418ec09d8 100644 --- a/pkgs/development/libraries/libpseudo/default.nix +++ b/pkgs/development/libraries/libpseudo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, ncurses}: +{stdenv, fetchurl, pkg-config, glib, ncurses}: stdenv.mkDerivation rec { name = "libpseudo-1.2.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ncurses ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 67e87a5faab..ed6d63aa524 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -8,7 +8,7 @@ , libidn2 , libunistring , libxslt -, pkgconfig +, pkg-config , python3 , valgrind , publicsuffix-list @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 gtk-doc lzip - pkgconfig + pkg-config python3 libxslt ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index e69cc04d6f0..829bea9351e 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, boost, libgsf, - pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }: + pkg-config, bzip2, xmlto, gettext, imagemagick, doxygen }: stdenv.mkDerivation rec { name = "libpst-0.6.75"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ boost libgsf bzip2 xmlto gettext imagemagick doxygen diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index b61bcd03027..ca1bfecfadb 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkgconfig, doxygen, +{ stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkg-config, doxygen, autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ intltool pkgconfig autoreconfHook doxygen ]; + nativeBuildInputs = [ intltool pkg-config autoreconfHook doxygen ]; buildInputs = [ curl gettext libiconv readline ]; configureFlags = ["--with-readline=${readline.dev}"]; propagatedBuildInputs = [ libxml2 mpfr icu ]; diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index 244dcf0999b..7f3ca25ec40 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig }: +{ stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { name = "libqb-0.17.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1zpl45p3n6dn1jgbsrrmccrmv2mvp8aqmnl0qxfjf7ymkrj9qhcs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { homepage = "https://github.com/clusterlabs/libqb"; diff --git a/pkgs/development/libraries/libr3/default.nix b/pkgs/development/libraries/libr3/default.nix index 0584203a581..d838c07de87 100644 --- a/pkgs/development/libraries/libr3/default.nix +++ b/pkgs/development/libraries/libr3/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , pcre -, pkgconfig +, pkg-config , check , autoreconfHook }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "09cixbms817p6nb77wz3rxp0znnac8ybycvsrrzgwlbfn58a3zwl"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ check ]; propagatedBuildInputs = [ pcre ]; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index f59f63c38ac..123bd87ae30 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }: stdenv.mkDerivation rec { pname = "libraw"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ lcms2 ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index d9b94a668c6..ff8679b86ab 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2, perl }: +{ stdenv, fetchurl, librdf_raptor2, gmp, pkg-config, pcre, libxml2, perl }: stdenv.mkDerivation rec { name = "rasqal-0.9.33"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0z6rrwn4jsagvarg8d5zf0j352kjgi33py39jqd29gbhcnncj939"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gmp pcre libxml2 ]; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index a85500d2c6e..f9863b922c7 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libxslt, perl +{ stdenv, fetchurl, pkg-config, openssl, libxslt, perl , curl, pcre, libxml2, librdf_rasqal, gmp , libmysqlclient, withMysql ? false , postgresql, withPostgresql ? false @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681"; }; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ openssl libxslt curl pcre libxml2 gmp ] ++ stdenv.lib.optional withMysql libmysqlclient diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 2768c20d657..0a56e4199e4 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -2,7 +2,7 @@ , autoreconfHook , gnutls , openssl -, pkgconfig +, pkg-config , zlib }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0miqjck9zh1hgsx1v395n0d4f1a1p5a8khybv2nsfjq04g9359c9"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gnutls zlib openssl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index bed92477a3f..747f9495015 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig, autoreconfHook +, pkg-config, autoreconfHook , readline, texinfo , gdbm, gmp, libffi }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ readline texinfo ]; propagatedBuildInputs = [ gdbm gmp libffi ]; diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index e1d7b336273..bff441589c2 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobject-introspection, gnome3 }: +{ stdenv, fetchurl, pkg-config, glib, libsoup, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "rest"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; }; - nativeBuildInputs = [ pkgconfig gobject-introspection ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; buildInputs = [ glib libsoup ]; configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index 2c6e792ae8c..d36157a883c 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib}: +{stdenv, fetchurl, boost, pkg-config, cppunit, zlib}: let s = # Generated upstream information rec { @@ -9,7 +9,7 @@ let url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz"; sha256="1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost cppunit zlib ]; diff --git a/pkgs/development/libraries/librevisa/default.nix b/pkgs/development/libraries/librevisa/default.nix index b49fb3f7ee7..f1df19dc2e5 100644 --- a/pkgs/development/libraries/librevisa/default.nix +++ b/pkgs/development/libraries/librevisa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 }: +{ stdenv, fetchurl, pkg-config, libusb1 }: # TODO: add VXI development files, for VXI-11 (TCPIP) support @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0bjzq23s3xzw0l9qx4l8achrx5id8xdd6r52lvdl4a28dxzbcfhq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index ecf518d04da..7e2956d31cb 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, gdk-pixbuf, pango, cairo, libxml2 +{ lib, stdenv, fetchurl, pkg-config, glib, gdk-pixbuf, pango, cairo, libxml2 , bzip2, libintl, darwin, rustc, cargo, gnome3 , vala, gobject-introspection }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gdk-pixbuf cairo ]; - nativeBuildInputs = [ pkgconfig rustc cargo vala gobject-introspection ] + nativeBuildInputs = [ pkg-config rustc cargo vala gobject-introspection ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 92958f389f0..645c742aca0 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsndfile, ApplicationServices, Carbon, CoreServices }: +{ stdenv, fetchurl, pkg-config, libsndfile, ApplicationServices, Carbon, CoreServices }: let inherit (stdenv.lib) optionals optionalString; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { sha256 = "1ha46i0nbibq0pl0pjwcqiyny4hj8lp1bnl4dpxm64zjw9lb2zha"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ] ++ optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index c9c105d1b18..472f7fdc51c 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}: +{stdenv, fetchFromGitHub, automake, autoconf, pkg-config, libtool, python2Packages, glib, jansson}: stdenv.mkDerivation rec { version = "3.2.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./libsearpc.pc.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool python2Packages.python python2Packages.simplejson ]; propagatedBuildInputs = [ glib jansson ]; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index d614ab01297..abc4b5949a8 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, gettext, libxslt, python3 +{ stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3 , docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala , gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ - pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl + pkg-config gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl gobject-introspection vala gtk-doc glib ]; buildInputs = [ libgcrypt ]; diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index c7f34362f39..f016e13fd89 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev, darwin }: +{ stdenv, fetchurl, pkg-config, udev, darwin }: stdenv.mkDerivation rec { name = "libserialport-0.1.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17ajlwgvyyrap8z7f16zcs59pksvncwbmd3mzf98wj7zqgczjaja"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = stdenv.lib.optional stdenv.isLinux udev ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit; diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 075855fada4..7bd65bbdfb2 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkg-config , libvorbis, libtheora, speex }: -# need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc +# need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc stdenv.mkDerivation rec { name = "libshout-2.4.4"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libvorbis libtheora speex ]; meta = { diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 5845916239c..d5f8dd6e573 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchurl -, pkgconfig +, pkg-config , docSupport ? true , doxygen ? null , graphviz ? null @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "04vdrrkh5y9x9rrmj6gdp242ah70b4sslwqfby8wp2riis4hr9z0"; }; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ optionals docSupport [ doxygen graphviz ]; installTargets = [ "install" ] diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix index 0fc19d20759..09552f86fa7 100644 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ b/pkgs/development/libraries/libsigcxx/1.2.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, m4}: +{stdenv, fetchurl, pkg-config, m4}: stdenv.mkDerivation rec { name = "libsigc++-1.2.7"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ m4]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index 8f883626d82..4cc741a71c1 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnum4, gnome3 }: +{ stdenv, fetchurl, pkg-config, gnum4, gnome3 }: stdenv.mkDerivation rec { pname = "libsigc++"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9"; }; - nativeBuildInputs = [ pkgconfig gnum4 ]; + nativeBuildInputs = [ pkg-config gnum4 ]; doCheck = true; diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix index 1f453dc291e..4ac48c4985f 100644 --- a/pkgs/development/libraries/libsignon-glib/default.nix +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -1,4 +1,4 @@ -{ 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 }: +{ 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 }: stdenv.mkDerivation rec { pname = "libsignon-glib"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index e5fd031b5ff..a950064cf6a 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, - libtool, gettext, pkgconfig, + libtool, gettext, pkg-config, vala, gnome-common, gobject-introspection, libgee, json-glib, skk-dicts, libxkbcommon }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ skk-dicts libxkbcommon ]; - nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkgconfig ]; + nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkg-config ]; propagatedBuildInputs = [ libgee json-glib ]; preConfigure = '' diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/development/libraries/libsmartcols/default.nix index bb3de08cf72..ceda7b5d936 100644 --- a/pkgs/development/libraries/libsmartcols/default.nix +++ b/pkgs/development/libraries/libsmartcols/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python3 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3 }: stdenv.mkDerivation rec { name = "libsmartcols"; version = "v2.36.1"; - nativeBuildInputs = [ autoreconfHook pkgconfig python3 ]; + nativeBuildInputs = [ autoreconfHook pkg-config python3 ]; src = fetchFromGitHub { owner = "karelzak"; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 739bc7d7332..d154a7194bb 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, autogen, flac, libogg, libopus, libvorbis, pkgconfig, python3 +{ stdenv, fetchFromGitHub, autoreconfHook, autogen, flac, libogg, libopus, libvorbis, pkg-config, python3 , Carbon, AudioToolbox }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1rh79y4s4m2wcm2kahmzs2kijpdpayif2gyca6m71f3k7jbhgcwa"; }; - nativeBuildInputs = [ autoreconfHook autogen pkgconfig python3 ]; + nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ]; buildInputs = [ flac libogg libopus libvorbis ] ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ]; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 88c6a359ba8..d052cbdc877 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3, libsysprof-capture +{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkg-config, gnome3, libsysprof-capture , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala , libpsl, python3, brotli }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ libsysprof-capture ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala glib ]; propagatedBuildInputs = [ glib libxml2 ]; NIX_CFLAGS_COMPILE = [ "-lpthread" ]; diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index bdc4504ad5a..2e9dadf0bf5 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos, libiconv }: +{ stdenv, lib, fetchurl, pkg-config, libxml2, sqlite, zlib, proj, geos, libiconv }: with lib; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 sqlite zlib proj geos libiconv ]; diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 11400a6a3e2..ec2a6242d9e 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, ghostscript, cairo }: +{ fetchurl, stdenv, pkg-config, ghostscript, cairo }: stdenv.mkDerivation rec { name = "libspectre-0.2.7"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ # Need `libgs.so'. - pkgconfig ghostscript cairo /*for tests*/ + pkg-config ghostscript cairo /*for tests*/ ]; doCheck = true; diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/development/libraries/libspectrum/default.nix index 24b9b9241c2..8922bedccdc 100644 --- a/pkgs/development/libraries/libspectrum/default.nix +++ b/pkgs/development/libraries/libspectrum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, pkgconfig, audiofile, bzip2, glib, libgcrypt, zlib }: +{ lib, stdenv, fetchurl, perl, pkg-config, audiofile, bzip2, glib, libgcrypt, zlib }: stdenv.mkDerivation rec { name = "libspectrum-1.4.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1cc0jx617sym6qj1f9fm115q44cq5azsxplqq2cgrg0pmlmjpyzx"; }; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ audiofile bzip2 glib libgcrypt zlib ]; diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index a77e209119b..d466b4e85a9 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -1,4 +1,4 @@ -{stdenv, pkgconfig, autoreconfHook, fetchFromGitHub }: +{stdenv, pkg-config, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libspiro"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1b5bw5qxqlral96y1n5f3sh9yxm2yij3zkqjmlgd8r1k4j0d3nqw"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; meta = with stdenv.lib; { description = "A library that simplifies the drawing of beautiful curves"; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 69cd24dfd6e..feb1f8e1736 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey ? null, unzip, gnused }: +{ stdenv, fetchurl, libspotify, alsaLib, readline, pkg-config, apiKey ? null, unzip, gnused }: let version = "12.1.51"; @@ -65,7 +65,7 @@ else stdenv.mkDerivation { pname = "libspotify-samples"; inherit version; src = libspotify.src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libspotify readline ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples"; diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index c6accad9c3c..95d4dc02029 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: +{ stdenv, fetchurl, pkg-config, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { pname = "libssh"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib openssl libsodium ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = "SSH client library"; diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index c1c506ef5e3..d6eb2647fbd 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, perl }: +{ stdenv, fetchurl, pkg-config, cmake, perl }: with stdenv.lib; stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1ga7rqmppa8ady665736cx443icscqlgflkqmxd4xbkzypmdj9bk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ cmake perl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix index df500cd7a41..7ce5b2f3214 100644 --- a/pkgs/development/libraries/libtelnet/default.nix +++ b/pkgs/development/libraries/libtelnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, zlib }: +{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, zlib }: stdenv.mkDerivation { pname = "libtelnet"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1lp6gdbndsp2w8mhy88c2jknxj2klvnggvq04ln7qjg8407ifpda"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ zlib ]; meta = { diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index bb2e1b05bce..4be42ff745e 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, libtool, pkgconfig, ncurses, unibilium }: +{ stdenv, lib, fetchzip, libtool, pkg-config, ncurses, unibilium }: stdenv.mkDerivation rec { pname = "libtermkey"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - nativeBuildInputs = [ libtool pkgconfig ]; + nativeBuildInputs = [ libtool pkg-config ]; buildInputs = [ ncurses unibilium ]; meta = with lib; { diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 656204fb0ce..94af9d76e78 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libogg, libvorbis, pkgconfig}: +{stdenv, fetchurl, libogg, libvorbis, pkg-config}: stdenv.mkDerivation rec { name = "libtheora-1.1.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputDoc = "devdoc"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libogg libvorbis ]; # GCC's -fforce-addr flag is not supported by clang diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 6d410962182..9bb572a912c 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , zlib , libjpeg @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection) diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index fbc726a4519..094ff565b3c 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libkate, pango, cairo, pkgconfig, darwin }: +{ stdenv, lib, fetchurl, libkate, pango, cairo, pkg-config, darwin }: stdenv.mkDerivation rec { name = "libtiger-0.3.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0rj1bmr9kngrgbxrjbn4f4f9pww0wmf6viflinq7ava7zdav4hkk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libkate pango cairo ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.ApplicationServices; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix index b2c958795f3..649d73b49b8 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf +{ stdenv, lib, fetchFromGitHub, pkg-config, automake, autoconf , zlib, boost, openssl, libtool, python, libiconv, ncurses }: @@ -22,7 +22,7 @@ in stdenv.mkDerivation { }; enableParallelBuilding = true; - nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; + nativeBuildInputs = [ automake autoconf libtool pkg-config ]; buildInputs = [ boostPython openssl zlib python libiconv ncurses ]; preConfigure = "./autotool.sh"; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 42c35e68edd..727516cad93 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack -, libvpx, check, libconfig, pkgconfig }: +, libvpx, check, libconfig, pkg-config }: let generic = { version, sha256 }: @@ -26,7 +26,7 @@ let libopus libvpx ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; doCheck = false; # hangs, tries to access the net? checkInputs = [ check ]; diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix index 6cd5f9122a4..d28fcf4a60d 100644 --- a/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus -, libvpx, check, libconfig, pkgconfig }: +, libvpx, check, libconfig, pkg-config }: stdenv.mkDerivation { name = "tox-core-new-20160727"; @@ -30,7 +30,7 @@ stdenv.mkDerivation { ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ autoreconfHook libsodium ncurses check libconfig ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 21108fa108e..73114d5bc96 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libxkbcommon, pkgconfig, cmake }: +{ stdenv, fetchFromGitHub, libxkbcommon, pkg-config, cmake }: stdenv.mkDerivation rec { pname = "libtsm"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = "Terminal-emulator State Machine"; diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index a9c62673115..fd8eada261c 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, json_c, hidapi }: +{ stdenv, fetchurl, fetchpatch, pkg-config, json_c, hidapi }: stdenv.mkDerivation rec { pname = "libu2f-host"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ json_c hidapi ]; doCheck = true; diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix index cd961cde1d2..b1187177f30 100644 --- a/pkgs/development/libraries/libu2f-server/default.nix +++ b/pkgs/development/libraries/libu2f-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, json_c, openssl, check, file, help2man, which, gengetopt }: +{ stdenv, fetchurl, fetchpatch, pkg-config, json_c, openssl, check, file, help2man, which, gengetopt }: stdenv.mkDerivation rec { name = "libu2f-server-1.1.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ json_c openssl check file help2man which gengetopt ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index 2cd5bd8a341..f8dfa80a959 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, cmake, pkgconfig, json_c }: +{ stdenv, lib, fetchgit, cmake, pkg-config, json_c }: stdenv.mkDerivation { pname = "libubox"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ json_c ]; meta = with lib; { diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 5cb19f863cc..74bc597c569 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, Cocoa }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, Cocoa }: let shortName = "libui"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "0bm6xvqk4drg2kw6d304x6mlfal7gh8mbl5a9f0509smmdzgdkwm"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux gtk3 ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; diff --git a/pkgs/development/libraries/libuinputplus/default.nix b/pkgs/development/libraries/libuinputplus/default.nix index 700a4701fc8..9f6f18555f7 100644 --- a/pkgs/development/libraries/libuinputplus/default.nix +++ b/pkgs/development/libraries/libuinputplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libuinputplus"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0jy5i7bmjad7hw1qcyjl4swqribp2027s9g3609zwj7lj8z5x0bg"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index e960117125e..14c84199c50 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkg-config , dbus, dbus-glib, gtk3, gobject-introspection , gtk-doc, docbook_xml_dtd_45, docbook_xsl , libxslt, libxml2 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0f70lkw66v9cj72q0iw1s2546r6bwwcd8idcm3621fg2fgh2rw58"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; meta = { diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 502fd27ebb6..45f5e6f786d 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus-glib }: +{ stdenv, fetchurl, pkg-config, glib, gtk2, dbus-glib }: stdenv.mkDerivation rec { pname = "libunique"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ./1.1.6-include-terminator.patch ] ++ [ ./gcc7-bug.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 dbus-glib ]; # Don't make deprecated usages hard errors diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index 037e84069b4..287c185385f 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchgit -, pkgconfig +, pkg-config , glib , vala , dee @@ -28,7 +28,7 @@ stdenv.mkDerivation { autoreconfHook gobject-introspection intltool - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/development/libraries/libusb-compat/0.1.nix b/pkgs/development/libraries/libusb-compat/0.1.nix index 2830ef28458..41fe7cc6f1e 100644 --- a/pkgs/development/libraries/libusb-compat/0.1.nix +++ b/pkgs/development/libraries/libusb-compat/0.1.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , patchelf -, pkgconfig +, pkg-config , libusb1 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # get rid of propagating systemd closure outputBin = "dev"; - nativeBuildInputs = [ autoreconfHook patchelf pkgconfig ]; + nativeBuildInputs = [ autoreconfHook patchelf pkg-config ]; buildInputs = [ libusb1 ]; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 10310e22da7..fef3d168c96 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl , udev ? null , libobjc @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; propagatedBuildInputs = stdenv.lib.optional enableUdev udev ++ stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index e2e0a6d9d75..cb8e1761d82 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libplist }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libplist }: stdenv.mkDerivation rec { pname = "libusbmuxd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "139pzsnixkck6ly1q6p0diqr0hgd0mx0pr4xx1jamm3f3656kpf9"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libplist ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index fa661446b9a..187b8574eef 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: +{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { version = "1.40.0"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { sed '/${tdRegexp}/d' -i test/test-list.h ''; - nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; + nativeBuildInputs = [ automake autoconf libtool pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; preConfigure = '' diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 1debefed0ad..dbd23c5abc9 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi +{ stdenv, lib, fetchurl, libX11, pkg-config, libXext, libdrm, libXfixes, wayland, libffi , libGL, mesa , minimal ? false, libva1-minimal }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ]; diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 98176cd41f1..5224da5d9e7 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libXau, libXdmcp +{ stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libpthreadstubs, libXau, libXdmcp , libXext, libvdpau, glib, libva, ffmpeg_3, libGLU }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0asndybfv8xb0fx73sjjw5kydqrahqkm6n04lh589pbf18s5qlld"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg_3 libGLU ]; doCheck = false; # fails. needs DRI access diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index cbb312e0f0d..42066bd2bf0 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xorg, mesa, meson, ninja }: +{ stdenv, fetchurl, pkg-config, xorg, mesa, meson, ninja }: stdenv.mkDerivation rec { pname = "libvdpau"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = with xorg; [ xorgproto libXext ]; propagatedBuildInputs = [ xorg.libX11 ]; diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index f9c695aedf7..7ebabaf7257 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, ncurses, gpm}: +{stdenv, fetchurl, pkg-config, glib, ncurses, gpm}: stdenv.mkDerivation rec { name = "libviper-1.4.6"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ncurses gpm]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index bf8d0b373f0..e7dbd2456cb 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gobject-introspection, intltool, vala +{ stdenv, fetchurl, pkg-config, gobject-introspection, intltool, vala , libcap_ng, libvirt, libxml2 }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz"; }; - nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ]; + nativeBuildInputs = [ pkg-config intltool vala gobject-introspection ]; buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libvirt/5.9.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix index b880d364274..024a667a4da 100644 --- a/pkgs/development/libraries/libvirt/5.9.0.nix +++ b/pkgs/development/libraries/libvirt/5.9.0.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit -, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch +, pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch , coreutils, libxml2, gnutls, perl, python2, attr , iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ makeWrapper pkgconfig rpcsvc-proto ]; + nativeBuildInputs = [ makeWrapper pkg-config rpcsvc-proto ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index b84ba92e2bf..4d17f3a8c0e 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig, zlib, gperf +{ stdenv, fetchurl, boost, libwpd, libwpg, pkg-config, zlib, gperf , librevenge, libxml2, icu, perl, cppunit, doxygen }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0k7adcbbf27l7n453cca1m6s9yj6qvb5j6bsg2db09ybf3w8vbwg"; }; - nativeBuildInputs = [ pkgconfig cppunit doxygen ]; + nativeBuildInputs = [ pkg-config cppunit doxygen ]; buildInputs = [ boost libwpd libwpg zlib gperf librevenge libxml2 icu perl ]; configureFlags = [ diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index 8fe53acc245..9559a604f0a 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib }: +{ stdenv, fetchurl, pkg-config, glib }: stdenv.mkDerivation rec { name = "libvisual-0.4.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 1603d32ba79..0f4bb4950f9 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -4,7 +4,7 @@ bison, flex, glib, - pkgconfig, + pkg-config, json_c, xen, libvirt, @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib libvirt json_c ] ++ (optional xenSupport xen); - nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ]; + nativeBuildInputs = [ autoreconfHook bison flex pkg-config ]; configureFlags = optional (!xenSupport) "--disable-xen"; diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 2a9f97cf67f..7ad8174cd48 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libogg, pkgconfig }: +{ stdenv, fetchurl, libogg, pkg-config }: stdenv.mkDerivation rec { name = "libvorbis-1.3.7"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libogg ]; doCheck = true; diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index 40324ec4932..6c37dc23ad7 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, ncurses }: +{ stdenv, fetchurl, pkg-config, glib, ncurses }: stdenv.mkDerivation rec { name = "libvterm-0.99.7"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ncurses ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 6ae116356f8..fe9aaaed125 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, glib, pkgconfig, udev, libgudev, doxygen }: +{ stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen }: stdenv.mkDerivation rec { pname = "libwacom"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "10wphlk5v591mlvcyr6bjqp60zmhbpqg3lmsq9dza738v97ws8ci"; }; - nativeBuildInputs = [ pkgconfig meson ninja doxygen ]; + nativeBuildInputs = [ pkg-config meson ninja doxygen ]; mesonFlags = [ "-Dtests=disabled" ]; diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index 5c684c7fd77..c7232ef6ba0 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ stdenv, fetchFromGitHub, pkg-config , freetype, glib, imagemagick, libjpeg, libpng, libxml2, zlib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0i2w5hg8mbgmgabxyd48qp1gx2mhk33hgr3jqvg72k0nhkd2jhf6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib imagemagick libpng glib freetype libjpeg libxml2 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 78aa231bda3..8b0e1868501 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -3,7 +3,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , gtk-doc , docbook_xsl , docbook_xml_dtd_412 @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext gobject-introspection gtk-doc diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index 2872181a36d..f4305cde7d7 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, intltool, xorg }: +{ stdenv, fetchurl, pkg-config, gtk2, intltool, xorg }: stdenv.mkDerivation rec { pname = "libwnck"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ]; # ?another optional: startup-notification diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix index f47208cda44..f924afd4e1a 100644 --- a/pkgs/development/libraries/libwpd/0.8.nix +++ b/pkgs/development/libraries/libwpd/0.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }: +{ stdenv, fetchurl, pkg-config, glib, libgsf, libxml2, bzip2 }: stdenv.mkDerivation rec { name = "libwpd-0.8.14"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libgsf libxml2 ]; - nativeBuildInputs = [ pkgconfig bzip2 ]; + nativeBuildInputs = [ pkg-config bzip2 ]; meta = with stdenv.lib; { description = "Library for importing WordPerfect documents"; diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 3464c55805d..ee1f13b2a3e 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, pkgconfig, glib, libgsf, libxml2, librevenge }: +{ stdenv, fetchurl, zlib, pkg-config, glib, libgsf, libxml2, librevenge }: stdenv.mkDerivation rec { name = "libwpd-0.10.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libgsf libxml2 zlib librevenge ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { description = "A library for importing and exporting WordPerfect documents"; diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index c844daf51f0..bbdb10f3f0f 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libwpd, zlib, librevenge }: +{ stdenv, fetchurl, pkg-config, libwpd, zlib, librevenge }: stdenv.mkDerivation rec { name = "libwpg-0.3.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libwpd zlib librevenge ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { homepage = "http://libwpg.sourceforge.net"; diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 3d40d204bdc..252b13dd6da 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, pkgconfig, librevenge, zlib }: +{ stdenv, fetchurl, boost, pkg-config, librevenge, zlib }: stdenv.mkDerivation rec { pname = "libwps"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "16c6vq6hhi5lcvgyb9dwarr3kz69l1g5fs39b2hwqhkwzx5igpcl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost librevenge zlib ]; NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index 9ecfa0ffd1a..4ab63e0e9c4 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libjpeg, libpng, libX11, zlib }: +{ stdenv, fetchurl, autoreconfHook, pkg-config, libjpeg, libpng, libX11, zlib }: stdenv.mkDerivation rec { pname = "libxcomp"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libjpeg libpng libX11 zlib ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; preAutoreconf = '' cd nxcomp/ diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index a73fb7cb870..75043b02e57 100644 --- a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }: +{ stdenv, fetchurl, pkg-config, yacc, flex, xkeyboard_config, libxcb, libX11 }: stdenv.mkDerivation rec { name = "libxkbcommon-0.7.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ yacc flex xkeyboard_config libxcb ]; configureFlags = [ diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index febe7f7b38c..88c3ae60cf3 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl +{ stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl , glib, isocodes, gobject-introspection }: let @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # TODO: enable xmodmap support, needs xmodmap DB propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; - nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc docbook_xsl ]; + nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc docbook_xsl ]; buildInputs = [ gobject-introspection ]; diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 97e8d23c070..182f2d79620 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -7,7 +7,7 @@ , gtk-doc , meson , ninja -, pkgconfig +, pkg-config , python3 , shared-mime-info , nixosTests @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config (python3.withPackages (pkgs: with pkgs; [ setuptools ])) shared-mime-info ]; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index c80808081ff..88f3bec6b95 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl, gnome3 }: +{ stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome3 }: stdenv.mkDerivation rec { pname = "libxml++"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "devdoc" ]; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; propagatedBuildInputs = [ libxml2 glibmm ]; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index be5c019e31e..c01d62989ef 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }: +{ stdenv, fetchurl, pkg-config, libxml2, glibmm, perl }: stdenv.mkDerivation rec { pname = "libxml++"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" "devdoc" ]; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ glibmm ]; diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix index ea900477f35..33ece6aed42 100644 --- a/pkgs/development/libraries/libykclient/default.nix +++ b/pkgs/development/libraries/libykclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, curl }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, curl }: stdenv.mkDerivation { pname = "libykclient"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "01b19jgv2lypih6lhw9yjjsfl8q1ahl955vhr2ai8ccshh0050yj"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig help2man ]; + nativeBuildInputs = [ autoreconfHook pkg-config help2man ]; buildInputs = [ curl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix index cb4f3bec011..614b66fdea3 100644 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pcsclite, libzip, help2man }: +{ stdenv, fetchurl, pkg-config, pcsclite, libzip, help2man }: stdenv.mkDerivation rec { name = "libykneomgr-0.1.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "12gqblz400kr11m1fdr1vvwr85lgy5v55zy0cf782whpk8lyyj97"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcsclite libzip help2man ]; configureFlags = [ diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index 4341b1e2041..1177196ed18 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }: +{ stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }: stdenv.mkDerivation rec { pname = "libzapojit"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; }; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; + nativeBuildInputs = [ pkg-config intltool gobject-introspection ]; propagatedBuildInputs = [ glib json-glib librest libsoup gnome-online-accounts ]; # zapojit-0.0.pc passthru = { diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 79933d402f7..27c046814f3 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "120xgf7cgjmz9d3yp10lks6lhkgxqb4skbmbiiwf46gx868qxsq6"; }; - # Fix pkgconfig file paths + # Fix pkg-config file paths postPatch = '' sed -i CMakeLists.txt \ -e 's#\\''${exec_prefix}/''${CMAKE_INSTALL_LIBDIR}#''${CMAKE_INSTALL_FULL_LIBDIR}#' \ diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index d3cbc430efc..a2013604deb 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkgconfig, cppunit}: +{stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkg-config, cppunit}: stdenv.mkDerivation rec { pname = "libzmf"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ boost icu libpng librevenge zlib cppunit ]; - nativeBuildInputs = [ doxygen pkgconfig ]; + nativeBuildInputs = [ doxygen pkg-config ]; configureFlags = [ "--disable-werror" ]; meta = { diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index 2f7740aa467..d47c7b50abe 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake , opentracing-cpp, protobuf, zlib , enableGrpc ? false, grpc ? null, openssl ? null, c-ares ? null }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig + cmake pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 7bca0c295c4..4683f374470 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , autoreconfHook , givaro -, pkgconfig +, pkg-config , blas , lapack , fflas-ffpack @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 97079be0962..9184c7330ed 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, help2man, python3, +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, help2man, python3, alsaLib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { touch lib/lirc/input_map.inc ''; - nativeBuildInputs = [ autoreconfHook pkgconfig help2man + nativeBuildInputs = [ autoreconfHook pkg-config help2man (python3.withPackages (p: with p; [ pyyaml setuptools ])) ]; buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ]; diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index e00fc07480e..de2f1b7c5c3 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libidn, glib, pkgconfig, zlib }: +{ stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib }: stdenv.mkDerivation rec { version = "1.5.3"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openssl libidn glib zlib ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { description = "A lightweight C library for the Jabber protocol"; diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/development/libraries/lrdf/default.nix index 80c8702b0b9..b37749385ba 100644 --- a/pkgs/development/libraries/lrdf/default.nix +++ b/pkgs/development/libraries/lrdf/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ config, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , librdf_raptor2, ladspaH, openssl, zlib , doCheck ? config.doCheckByDefault or false, ladspaPlugins }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sed -i -e 's:usr/local:${ladspaPlugins}:' examples/{instances,remove}_test.c ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ librdf_raptor2 ]; diff --git a/pkgs/development/libraries/luksmeta/default.nix b/pkgs/development/libraries/luksmeta/default.nix index 9e01605d2df..afefcfed82c 100644 --- a/pkgs/development/libraries/luksmeta/default.nix +++ b/pkgs/development/libraries/luksmeta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, asciidoc +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, asciidoc , cryptsetup }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "10nslwk7m1qwskd12c204ipa3cbad0q6fn0v084z2f7q6xxbkd2d"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc ]; + nativeBuildInputs = [ autoreconfHook pkg-config asciidoc ]; buildInputs = [ cryptsetup ]; meta = { diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 64ddba517df..a4d4f408f90 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -23,7 +23,7 @@ , libv4l , libvpx , ortp -, pkgconfig +, pkg-config , python , SDL , speex @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { cmake doxygen intltool - pkgconfig + pkg-config python ]; diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 45b3c83bfe2..527c395963f 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -4,7 +4,7 @@ , fetchpatch , mediastreamer , openh264 -, pkgconfig +, pkg-config , stdenv }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "140hs5lzpshzswvl39klcypankq3v2qck41696j22my7s4wsa0hr"; }; - nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; + nativeBuildInputs = [ autoreconfHook cmake pkg-config ]; buildInputs = [ mediastreamer openh264 ]; # Do not build static libraries diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index d7b39c28a42..36e3c8c6700 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, libfm-extra }: +{ stdenv, fetchurl, glib, pkg-config, libfm-extra }: let name = "menu-cache-1.1.0"; in @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libfm-extra ]; diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 9679ddb94e8..1f42828907a 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGL, ApplicationServices }: +{ stdenv, fetchurl, pkg-config, libGL, ApplicationServices }: stdenv.mkDerivation rec { pname = "glu"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1g2m634p73mixkzv1qz1d0flwm390ydi41bwmchiqvdssqnlqnpv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libGL ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 55264888e2a..217aff58966 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, buildPackages -, pkgconfig, intltool, ninja, meson +, pkg-config, intltool, ninja, meson , file, flex, bison, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau, python3Packages @@ -129,10 +129,10 @@ stdenv.mkDerivation { ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] ++ lib.optional withValgrind valgrind-light; - depsBuildBuild = [ pkgconfig ]; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ - pkgconfig meson ninja + pkg-config meson ninja intltool bison flex file python3Packages.python python3Packages.Mako ] ++ lib.optionals (elem "wayland" eglPlatforms) [ diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 1f2915c5071..7423c0e5c77 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif -, libvorbis, libxml2, movit, pkgconfig, sox, fftw, opencv4, SDL2 +, libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 , gtk2, genericUpdater, common-updater-scripts, libebur128 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 - makeWrapper movit pkgconfig sox libexif gtk2 fftw libebur128 + makeWrapper movit pkg-config sox libexif gtk2 fftw libebur128 opencv4 SDL2 ]; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index f8ec278ea78..599209fa57d 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -9,7 +9,7 @@ , libvorbis , libxml2 , movit -, pkgconfig +, pkg-config , sox , qtbase , qtsvg @@ -45,7 +45,7 @@ mkDerivation rec { libvorbis libxml2 movit - pkgconfig + pkg-config qtbase qtsvg sox diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index d011419cea7..523de7cc6bf 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, perl, pkgconfig, libbson +{ stdenv, fetchzip, perl, pkg-config, libbson , openssl, which, zlib, snappy }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8"; }; - nativeBuildInputs = [ pkgconfig which perl ]; + nativeBuildInputs = [ pkg-config which perl ]; buildInputs = [ openssl zlib ]; propagatedBuildInputs = [ libbson snappy ]; diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index d9c1636e59b..672d29e20f4 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono4, gtk-sharp-2_0 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono4, gtk-sharp-2_0 }: stdenv.mkDerivation rec { pname = "mono-addins"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "018g3bd8afjc39h22h2j5r6ldsdn08ynx7wg889gdvnxg3hrxgl2"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged buildInputs = [ mono4 gtk-sharp-2_0 ]; diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index f03ba81e868..144f11355e1 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libtool +{ stdenv, fetchurl, pkg-config, libtool , xlibsWrapper, xbitmaps, libXrender, libXmu, libXt , expat, libjpeg, libpng, libiconv , flex @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { expat libjpeg libpng libiconv ]; - nativeBuildInputs = [ pkgconfig flex ]; + nativeBuildInputs = [ pkg-config flex ]; propagatedBuildInputs = [ libXp libXau ]; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 901d299728f..3201de460ff 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkgconfig }: +{ stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkg-config }: stdenv.mkDerivation rec { pname = "movit"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ eigen epoxy ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 fftw gtest ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix index 26066f1194f..0411a8bf623 100644 --- a/pkgs/development/libraries/msgpuck/default.nix +++ b/pkgs/development/libraries/msgpuck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "msgpuck"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = ''A simple and efficient MsgPack binary serialization library in a self-contained header file''; diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix index 601e70427a1..c388a291cc5 100644 --- a/pkgs/development/libraries/msilbc/default.nix +++ b/pkgs/development/libraries/msilbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ilbc, mediastreamer, pkgconfig }: +{ stdenv, fetchurl, ilbc, mediastreamer, pkg-config }: stdenv.mkDerivation rec { name = "msilbc-2.1.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ ilbc mediastreamer ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = [ "ILBC_LIBS=ilbc" "ILBC_CFLAGS=-I${ilbc}/include" diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 842d144005d..dff15bdc606 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , fetchpatch , cmake -, pkgconfig +, pkg-config , boost17x , openssl , zlib @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ spdlog diff --git a/pkgs/development/libraries/mumlib/default.nix b/pkgs/development/libraries/mumlib/default.nix index f936fc8b3df..02f0cd671f2 100644 --- a/pkgs/development/libraries/mumlib/default.nix +++ b/pkgs/development/libraries/mumlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config , boost, openssl, log4cpp, libopus, protobuf }: with lib; stdenv.mkDerivation { pname = "mumlib"; @@ -12,7 +12,7 @@ with lib; stdenv.mkDerivation { }; buildInputs = [ boost openssl libopus protobuf log4cpp ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; installPhase = '' install -Dm555 libmumlib.so $out/lib/libmumlib.so cp -a ../include $out diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix index 570588e22fb..07a57c66480 100644 --- a/pkgs/development/libraries/mypaint-brushes/1.0.nix +++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix @@ -2,7 +2,7 @@ , autoconf , automake , fetchFromGitHub -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake - pkgconfig + pkg-config ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix index d2fb8ed143a..08ac20e447c 100644 --- a/pkgs/development/libraries/mypaint-brushes/default.nix +++ b/pkgs/development/libraries/mypaint-brushes/default.nix @@ -2,7 +2,7 @@ , autoconf , automake , fetchFromGitHub -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake - pkgconfig + pkg-config ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix index 1cd8612c3bb..b4983455675 100644 --- a/pkgs/development/libraries/mythes/default.nix +++ b/pkgs/development/libraries/mythes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, hunspell, ncurses, pkgconfig, perl }: +{ stdenv, fetchurl, hunspell, ncurses, pkg-config, perl }: stdenv.mkDerivation rec { name = "mythes-1.2.4"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ hunspell ]; - nativeBuildInputs = [ ncurses pkgconfig perl ]; + nativeBuildInputs = [ ncurses pkg-config perl ]; meta = { homepage = "http://hunspell.sourceforge.net/"; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 17a924e6e74..742de6cf92e 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , abiVersion ? "6" , mouseSupport ? false @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ - pkgconfig + pkg-config ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.ncurses ]; diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index 6f0dbf032a9..a6b6e88cec3 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, readline, makeWrapper }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, readline, makeWrapper }: stdenv.mkDerivation { name = "neardal-0.7-post-git-20150930"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool glib readline makeWrapper ]; preConfigure = '' diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index c60f5e60fb8..89b48221ca8 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, pkgconfig, perl +{ stdenv, fetchurl, libxml2, pkg-config, perl , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? false @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libxml2 openssl] ++ stdenv.lib.optional compressionSupport zlib; diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index e9ce6ee18b4..935a17d3d78 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, pkgconfig, perl +{ stdenv, fetchurl, libxml2, pkg-config, perl , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? stdenv.hostPlatform.isStatic @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libxml2 openssl] ++ stdenv.lib.optional compressionSupport zlib; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 7bcdf8feb30..0ec941ff182 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkg-config # Optional Dependencies , openssl ? null, zlib ? null @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "lib" ] ++ optional enablePython "python"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ optional enableLibEv libev ++ [ zlib ] diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index f7a608d5c0a..94c4bd84d9a 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: +{ stdenv, fetchFromGitHub, nix, cmake, pkg-config, boost }: let version = "6.0.0"; in stdenv.mkDerivation { pname = "nix-plugins"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "08kxdci0sijj1hfkn3dbr7nbpb9xck0xr3xa3a0j116n4kvwb6qv"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ nix boost ]; diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix index 189e36c1b44..7b9bffb9bc9 100644 --- a/pkgs/development/libraries/notcurses/default.nix +++ b/pkgs/development/libraries/notcurses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, pkgconfig, pandoc, libunistring, ncurses, ffmpeg, +{ stdenv, cmake, pkg-config, pandoc, libunistring, ncurses, ffmpeg, fetchFromGitHub, lib, multimediaSupport ? true }: @@ -11,7 +11,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake pkgconfig pandoc ]; + nativeBuildInputs = [ cmake pkg-config pandoc ]; buildInputs = [ libunistring ncurses ] ++ lib.optional multimediaSupport ffmpeg; diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix index 58d35767d1e..a1a7a9ad6cb 100644 --- a/pkgs/development/libraries/notify-sharp/default.nix +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitLab, pkg-config, autoreconfHook , mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig autoreconfHook + pkg-config autoreconfHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 17a294adc4b..47fd43d7e35 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, pkgconfig, libnl, python }: +{ stdenv, fetchurl, qt4, pkg-config, libnl, python }: let version = "016"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnl qt4 ]; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ pkg-config python ]; # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index bc6ceff8378..cafcf96e46b 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, icu, catch2, pandoc }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2, pandoc }: stdenv.mkDerivation rec { pname = "nuspell"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-sQ3Q2+FOf2bXCKcgd6XvEb+QZzzDccs/4+CpJbEd1PQ="; }; - nativeBuildInputs = [ cmake pkgconfig pandoc ]; + nativeBuildInputs = [ cmake pkg-config pandoc ]; buildInputs = [ icu ]; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index 9a8c092406c..7e87ac43408 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, ois, ogre, libX11, boost }: +{ stdenv, fetchurl, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }: stdenv.mkDerivation rec { pname = "ogre-paged"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ ois ogre libX11 boost ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF" ]; diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index c0b2366ab7f..ad17e7dcac7 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, - pkgconfig, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb, + pkg-config, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb, OpenCL, Cocoa }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "17wy8dcf44vqisishv1jjf3cmcxyygqq29y9c3wjdj983qi2hsig"; }; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = [ libGL libGLU libXmu freetype fontconfig expat freeimage vtk gl2ps tbb diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index a60051dbd5f..6745d6bf0ce 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, boost, pkgconfig, lcms2, tinyxml, git }: +{ stdenv, lib, fetchFromGitHub, cmake, boost, pkg-config, lcms2, tinyxml, git }: with lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; # TODO: Investigate whether git can be dropped: It's only used to apply patches - nativeBuildInputs = [ cmake pkgconfig git ]; + nativeBuildInputs = [ cmake pkg-config git ]; buildInputs = [ lcms2 tinyxml ] ++ optional stdenv.isDarwin boost; diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index 27a832daf47..c0a021a9d3b 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb-compat-0_1 +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcsclite, libusb-compat-0_1 , doxygen, libxslt }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ pcsclite libusb-compat-0_1 doxygen libxslt ]; preInstall = '' diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index a861591f85f..8a846808080 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub, fetchpatch -, cmake, pkgconfig, unzip, zlib, pcre, hdf5 +, cmake, pkg-config, unzip, zlib, pcre, hdf5 , glog, boost, gflags, protobuf , config @@ -206,7 +206,7 @@ stdenv.mkDerivation { propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; - nativeBuildInputs = [ cmake pkgconfig unzip ]; + nativeBuildInputs = [ cmake pkg-config unzip ]; NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 0d225127dd8..3d845b7368b 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl, fetchFromGitHub, fetchpatch -, cmake, pkgconfig, unzip, zlib, pcre, hdf5 +, cmake, pkg-config, unzip, zlib, pcre, hdf5 , glog, boost, gflags, protobuf , config @@ -216,7 +216,7 @@ stdenv.mkDerivation { propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; - nativeBuildInputs = [ cmake pkgconfig unzip ]; + nativeBuildInputs = [ cmake pkg-config unzip ]; NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 055377b09f5..0d4d2c6e001 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unzip +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unzip , zlib , enablePython ? false, pythonPackages , enableGtk2 ? false, gtk2 @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; - nativeBuildInputs = [ cmake pkgconfig unzip ]; + nativeBuildInputs = [ cmake pkg-config unzip ]; NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "bindnow" "relro" ]; - # Fix pkgconfig file that gets broken with multiple outputs + # Fix pkg-config file that gets broken with multiple outputs postFixup = '' sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_old=.*|includedir_old=$dev/include/opencv|" sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_new=.*|includedir_new=$dev/include|" diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 7cbd85055ef..b40b3bc4def 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libbsd, openssl, libmilter +{ stdenv, fetchurl, pkg-config, libbsd, openssl, libmilter , autoreconfHook, perl, makeWrapper }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "ac_cv_func_realloc_0_nonnull=yes" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; buildInputs = [ libbsd openssl libmilter perl ]; diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index f9da637cb6e..5ed35844eb0 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkg-config , libpng, libtiff, lcms2, jpylyzer , mj2Support ? true # MJ2 executables , jpwlLibSupport ? true # JPWL library & executables @@ -54,7 +54,7 @@ stdenv.mkDerivation { (mkFlag testsSupport "BUILD_TESTING") ] ++ extraFlags; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ ] ++ optionals jpipServerSupport [ curl fcgi ] diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index 0edf6dfa728..779e17e4c81 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig +{ stdenv, fetchgit, autoreconfHook, pkg-config , boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ]; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index e2a52a93333..78c37e94b93 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libX11, libXinerama, libXrandr, libGLU, libGL, glib, ilmbase, libxml2, pcre, zlib, AGL, Carbon, Cocoa, Foundation, @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { sha256 = "0x8hdbzw0b71j91fzp9cwmy9a7ava8v8wwyj8nxijq942vdx1785"; }; - nativeBuildInputs = [ pkgconfig cmake doxygen ]; + nativeBuildInputs = [ pkg-config cmake doxygen ]; buildInputs = [ libX11 libXinerama libXrandr libGLU libGL diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index a16b8356e61..e139a1f509c 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkg-config , curl, libxml2, pam, sblim-sfcc }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "19dj38jyzhhhvk863cikcwk5awzlq3337pxmsaqqm4wrcygrkfmx"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ curl libxml2 pam sblim-sfcc ]; diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index dd7a367652d..641776cc944 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, doxygen, fontconfig, graphviz-nox, libxml2, pkgconfig, which +, doxygen, fontconfig, graphviz-nox, libxml2, pkg-config, which , systemd }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation { sha256 = "04g8fb4f4ihakvvsmzcnncgfdd2ikmki7s22i9c6layzdwavbwf1"; }; - nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkgconfig which ]; + nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkg-config which ]; buildInputs = [ systemd ]; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { --replace dir= dir=$out substituteInPlace $out/bin/ozw_config \ - --replace pcfile=${pkgconfig} pcfile=$out + --replace pcfile=${pkg-config} pcfile=$out ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index e34a80e1d4a..f1aa1968493 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,4 +1,4 @@ -{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }: +{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkg-config, stdenv }: stdenv.mkDerivation rec { pname = "osm-gps-map"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo glib gobject-introspection diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 31a7e7e9086..a93bc6763c0 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, which +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, which , gettext, libffi, libiconv, libtasn1 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # at the same time, libtasn1 in buildInputs provides the libasn1 library # to link against for the target platform. # hence, libtasn1 is required in both native and build inputs. - nativeBuildInputs = [ autoreconfHook pkgconfig which libtasn1 ]; + nativeBuildInputs = [ autoreconfHook pkg-config which libtasn1 ]; buildInputs = [ gettext libffi libiconv libtasn1 ]; autoreconfPhase = '' diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index b3dd2062ca0..ff1fcb945ca 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, cairo, harfbuzz +{ stdenv, fetchurl, fetchpatch, pkg-config, cairo, harfbuzz , libintl, libthai, gobject-introspection, darwin, fribidi, gnome3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf , meson, ninja, glib @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja glib # for glib-mkenum - pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 + pkg-config gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ fribidi diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 5fbd9595766..4cb90e297cf 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, libGL, glew +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew , xorg , ffmpeg_3, python3 , libjpeg, libpng, libtiff, eigen , Carbon ? null, Cocoa ? null }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "0pfbaarlsw7f7cmsppm7m13nz0k530wwwyczy2l9k448p3v7x9j0"; }; - nativeBuildInputs = [ cmake pkgconfig doxygen ]; + nativeBuildInputs = [ cmake pkg-config doxygen ]; buildInputs = [ libGL diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index b0488435ded..1443e74d608 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, gnome3 +{ stdenv, fetchurl, pkg-config, pango, glibmm, cairomm, gnome3 , ApplicationServices }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config ] ++ stdenv.lib.optional stdenv.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ pango glibmm cairomm ]; diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index 26d012e81e1..ff23a7f30f2 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, pango}: +{stdenv, fetchurl, pkg-config, glib, pango}: stdenv.mkDerivation { name = "pangoxsl-1.6.0.3"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1wcd553nf4nwkrfrh765cyzwj9bsg7zpkndg2hjs8mhwgx04lm8n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib pango diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index e9c5301aac5..8301d1a6f1a 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchFromGitHub -, autoconf, automake, which, libtool, pkgconfig +, autoconf, automake, which, libtool, pkg-config , portaudio, alsaLib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0"; }; - nativeBuildInputs = [ autoconf automake which libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake which libtool pkg-config ]; buildInputs = [ portaudio ] ++ lib.optionals stdenv.isLinux [ alsaLib ] diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 06f5499b901..0c57e8b4b68 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake -, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase +, qhull, flann, boost, vtk, eigen, pkg-config, qtbase , libusb1, libpcap, libXt, libpng, Cocoa, AGL, OpenGL }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ qhull flann boost eigen libusb1 libpcap libpng vtk qtbase libXt ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL ]; diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix index 16d19f570d1..dbc7e0c3a59 100644 --- a/pkgs/development/libraries/phash/default.nix +++ b/pkgs/development/libraries/phash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cimg, imagemagick }: +{ stdenv, fetchFromGitHub, pkg-config, cimg, imagemagick }: stdenv.mkDerivation rec { pname = "pHash"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # at runtime propagatedBuildInputs = [ imagemagick ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = ["--enable-video-hash=no" "--enable-audio-hash=no"]; postInstall = '' diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 5c0901596b0..c066e15a8f9 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkgconfig +{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkg-config , extra-cmake-modules, qttools, qtbase, qtx11extras , debug ? false }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { gst-libav ]); in toString [ - # This flag should be picked up through pkgconfig, but it isn't. + # This flag should be picked up through pkg-config, but it isn't. "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include" ''-DGST_PLUGIN_PATH_1_0="${gstPluginPaths}"'' @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index d54ee6e5630..3dc5071ba15 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, libvlc +{ stdenv, lib, fetchurl, cmake, phonon, pkg-config, libvlc , extra-cmake-modules, qttools, qtbase, qtx11extras , debug ? false }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config qttools extra-cmake-modules ]; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 85ba37a9d8a..926b8593c59 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -4,7 +4,7 @@ , cmake , libGLU , libGL -, pkgconfig +, pkg-config , libpulseaudio , extra-cmake-modules , qtbase @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config extra-cmake-modules ]; diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix index eaedc2c0ac3..70ab98439cc 100644 --- a/pkgs/development/libraries/pipewire/0.2.nix +++ b/pkgs/development/libraries/pipewire/0.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind +{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, doxygen, graphviz, valgrind , glib, dbus, gst_all_1, alsaLib, ffmpeg_4, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf }: @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "doc" ]; nativeBuildInputs = [ - meson ninja pkgconfig doxygen graphviz valgrind + meson ninja pkg-config doxygen graphviz valgrind ]; buildInputs = [ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index c9697ee1a42..b8be63f8e53 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -6,7 +6,7 @@ , meson , ninja , systemd -, pkgconfig +, pkg-config , doxygen , graphviz , valgrind @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { graphviz meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index d7f5b34e5d7..ef9ae533ca1 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpng, glib /*just passthru*/ }: +{ stdenv, fetchurl, pkg-config, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { pname = "pixman"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0l0m48lnmdlmnaxn2021qi5cj366d9fzfjxkqgcj9bs14pxbgaw4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng ]; diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index cb8e05b6a76..debb0309e91 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, openssl, autoreconfHook }: +{ stdenv, fetchFromGitHub, pkg-config, openssl, autoreconfHook }: stdenv.mkDerivation rec { pname = "pkcs11-helper"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1idrqip59bqzcgddpnk2inin5n5yn4y0dmcyaggfpdishraiqgd5"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix index fe3176f9f76..3bd5aa46be5 100644 --- a/pkgs/development/libraries/pmdk/default.nix +++ b/pkgs/development/libraries/pmdk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, autoconf, libndctl, pkgconfig +, autoconf, libndctl, pkg-config }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1833sq0f1msaqwn31dn1fp37a6d5zp995i9gkazanydmppi2qy0i"; }; - nativeBuildInputs = [ autoconf pkgconfig ]; + nativeBuildInputs = [ autoconf pkg-config ]; buildInputs = [ libndctl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix index 0f9be199d95..71b36cedb81 100644 --- a/pkgs/development/libraries/pocketsphinx/default.nix +++ b/pkgs/development/libraries/pocketsphinx/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , sphinxbase -, pkgconfig +, pkg-config , python27 # >= 2.6 , swig2 # 2.0 }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ sphinxbase ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python27 swig2 ]; meta = { diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index c0f74630757..1f2d43fce3c 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }: +{ stdenv, fetchurl, cmake, pkg-config, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }: stdenv.mkDerivation rec { pname = "poco"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1jilzh0h6ik5lr167nax7q6nrpzxl99p11pkl202ig06pgh32nbz"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysqlclient ]; diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 242645ebfdb..ba743bb6053 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig -, openssl, libpng, lua5, pkgconfig, libidn, expat, fetchpatch +, openssl, libpng, lua5, pkg-config, libidn, expat, fetchpatch }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat lua5 ]; diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix index b13335561ac..a758146d406 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib, qt4 }: +{ stdenv, fetchurl, cmake, pkg-config, polkit, automoc4, glib, qt4 }: with stdenv.lib; @@ -12,7 +12,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake pkgconfig automoc4 ]; + nativeBuildInputs = [ cmake pkg-config automoc4 ]; propagatedBuildInputs = [ polkit glib qt4 ]; diff --git a/pkgs/development/libraries/polkit-qt-1/qt-5.nix b/pkgs/development/libraries/polkit-qt-1/qt-5.nix index f6cbf7e972b..76efca9717b 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-5.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, polkit, glib, qtbase }: +{ stdenv, fetchurl, cmake, pkg-config, polkit, glib, qtbase }: with stdenv.lib; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; propagatedBuildInputs = [ polkit glib qtbase ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 2ec49a2d3c0..6382097d398 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, expat, pam, perl, fetchpatch +{ stdenv, fetchurl, pkg-config, glib, expat, pam, perl, fetchpatch , intltool, spidermonkey_78, gobject-introspection, libxslt, docbook_xsl, dbus , docbook_xml_dtd_412, gtk-doc, coreutils , useSystemd ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl), systemd, elogind @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; # small man pages in $bin nativeBuildInputs = - [ glib gtk-doc pkgconfig intltool perl ] + [ glib gtk-doc pkg-config intltool perl ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages buildInputs = [ expat pam spidermonkey_78 ] diff --git a/pkgs/development/libraries/poly2tri-c/default.nix b/pkgs/development/libraries/poly2tri-c/default.nix index 5799410fe1d..60d75d340e6 100644 --- a/pkgs/development/libraries/poly2tri-c/default.nix +++ b/pkgs/development/libraries/poly2tri-c/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , glib }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix index 0603f49fad4..bc141075973 100644 --- a/pkgs/development/libraries/poppler/0.61.nix +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl +{ stdenv, lib, fetchurl, cmake, ninja, pkg-config, libiconv, libintl , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg, fetchpatch , withData ? true, poppler_data , qt5Support ? false, qtbase ? null @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ++ optional qt5Support qtbase ++ optional introspectionSupport gobject-introspection; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; # Not sure when and how to pass it. It seems an upstream bug anyway. CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index e7b9a26f19f..80d5ba19d2b 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkgconfig, libiconv, libintl +{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkg-config, libiconv, libintl , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , withData ? true, poppler_data , qt5Support ? false, qtbase ? null @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ++ optional utils nss ++ optional introspectionSupport gobject-introspection; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; # Workaround #54606 preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index aa8afb7ac97..da4c3933aaa 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, pkgconfig, libjack2 +{ stdenv, fetchurl, alsaLib, pkg-config, libjack2 , AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index 4b0d273ac44..c9c246f1910 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -1,5 +1,5 @@ { stdenv, src, version -, autoreconfHook, pkgconfig, protobuf, zlib +, autoreconfHook, pkg-config, protobuf, zlib , ... }: @@ -9,7 +9,7 @@ stdenv.mkDerivation { inherit src; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ protobuf zlib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/pslib/default.nix b/pkgs/development/libraries/pslib/default.nix index 08accd5d7df..35c4f7c3b2d 100644 --- a/pkgs/development/libraries/pslib/default.nix +++ b/pkgs/development/libraries/pslib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, zlib, libpng, libjpeg, libungif, libtiff +{ stdenv, fetchurl, cmake, pkg-config, zlib, libpng, libjpeg, libungif, libtiff }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0m191ckqj1kj2yvxiilqw26x4vrn7pnlc2vy636yphjxr02q8bk4"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib libpng libjpeg libungif libtiff ]; doCheck = true; diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 06de3f7c569..c735b15336a 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openssl, pkgconfig, qtbase }: +{ stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }: stdenv.mkDerivation rec { pname = "qca-qt5"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ openssl qtbase ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; # Without this patch cmake fails with a "No known features for CXX compiler" # error on darwin diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 6520d4a64a3..b637b491387 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, cmake, pkgconfig, qt, darwin }: +{ stdenv, fetchurl, openssl, cmake, pkg-config, qt, darwin }: stdenv.mkDerivation rec { pname = "qca"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl qt ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index 3ff642bbfb9..f739c1bc275 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -2,7 +2,7 @@ , lib , fetchFromGitHub , nix-update-script -, pkgconfig +, pkg-config , gtk3 , glib , qtbase @@ -33,7 +33,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config qmake ]; diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix index 2c60c4c10d0..3b4764151e3 100644 --- a/pkgs/development/libraries/qrencode/default.nix +++ b/pkgs/development/libraries/qrencode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, SDL2, libpng, libiconv }: +{ stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv }: stdenv.mkDerivation rec { pname = "qrencode"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-2kSO1PUqumvLDNSMrA3VG4aSvMxM0SdDFAL8pvgXHo4="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 libpng ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; configureFlags = [ diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 3deea882bb6..c92218f9fe5 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch, substituteAll , libXrender, libXinerama, libXcursor, libXv, libXext , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng -, libmng, which, libGLU, openssl, dbus, cups, pkgconfig +, libmng, which, libGLU, openssl, dbus, cups, pkg-config , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi , alsaLib , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms @@ -199,7 +199,7 @@ stdenv.mkDerivation rec { ++ lib.optionals gtkStyle [ gtk2 gdk-pixbuf ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ]; - nativeBuildInputs = [ perl pkgconfig which ]; + nativeBuildInputs = [ perl pkg-config which ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 5d6f91a7911..24f1d6f81a2 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -2,7 +2,7 @@ stdenv, lib, src, patches, version, qtCompatVersion, - coreutils, bison, flex, gdb, gperf, lndir, perl, pkgconfig, python3, + coreutils, bison, flex, gdb, gperf, lndir, perl, pkg-config, python3, which, # darwin support darwin, libiconv, @@ -87,7 +87,7 @@ stdenv.mkDerivation { ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = - [ bison flex gperf lndir perl pkgconfig which ]; + [ bison flex gperf lndir perl pkg-config which ]; propagatedNativeBuildInputs = [ lndir ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix index 281f6e0b8ec..6bc023eb9bb 100644 --- a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix +++ b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix @@ -1,9 +1,9 @@ -{ qtModule, qtbase, qtdeclarative, pkgconfig }: +{ qtModule, qtbase, qtdeclarative, pkg-config }: qtModule { name = "qtgamepad"; qtInputs = [ qtbase qtdeclarative ]; buildInputs = [ ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index 42ed23bb6dc..b9e757833b3 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -1,4 +1,4 @@ -{ qtModule, stdenv, qtbase, qtdeclarative, pkgconfig +{ qtModule, stdenv, qtbase, qtdeclarative, pkg-config , alsaLib, gstreamer, gst-plugins-base, libpulseaudio, wayland }: @@ -7,7 +7,7 @@ with stdenv.lib; qtModule { name = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gstreamer gst-plugins-base libpulseaudio ] ++ optional (stdenv.isLinux) alsaLib ++ optional (versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland; diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix index c7a7704f283..5291ea9c9a7 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -1,9 +1,9 @@ -{ qtModule, qtbase, qtquickcontrols, wayland, pkgconfig }: +{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config }: qtModule { name = "qtwayland"; qtInputs = [ qtbase qtquickcontrols ]; buildInputs = [ wayland ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index b98b711c0f5..e6ab23073b1 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -1,7 +1,7 @@ { qtModule , qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel -, bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which +, bison, coreutils, flex, git, gperf, ninja, pkg-config, python2, which , xorg, libXcursor, libXScrnSaver, libXrandr, libXtst , fontconfig, freetype, harfbuzz, icu, dbus, libdrm @@ -24,7 +24,7 @@ qtModule { name = "qtwebengine"; qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; nativeBuildInputs = [ - bison coreutils flex git gperf ninja pkgconfig python2 which gn + bison coreutils flex git gperf ninja pkg-config python2 which gn ] ++ optional stdenv.isDarwin xcbuild; doCheck = true; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 3d9e72bb54f..d8d53690b24 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -2,7 +2,7 @@ , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel , fontconfig, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1, cmake -, bison, flex, gdb, gperf, perl, pkgconfig, python2, ruby +, bison, flex, gdb, gperf, perl, pkg-config, python2, ruby , darwin , flashplayerFix ? false }: @@ -31,7 +31,7 @@ qtModule { ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ ICU OpenGL ]) ++ optional usingAnnulenWebkitFork hyphen; nativeBuildInputs = [ - bison flex gdb gperf perl pkgconfig python2 ruby + bison flex gdb gperf perl pkg-config python2 ruby ] ++ optional usingAnnulenWebkitFork cmake; cmakeFlags = optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ] diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index ddfdc2f67d3..60eb19ac0c7 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4 ? null +{ stdenv, fetchFromGitHub, cmake, pkg-config, qt4 ? null , withQt5 ? false, qtbase ? null, qttools ? null , darwin ? null , libsecret @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pkgconfig ] # for finding libsecret + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pkg-config ] # for finding libsecret ; buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ libsecret ] diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index 1970dd183c1..7f340ce1eef 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, gtk2 }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }: mkDerivation { name = "qtstyleplugins-2017-03-11"; @@ -12,7 +12,7 @@ mkDerivation { patches = [ ./fix-build-against-Qt-5.15.patch ]; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ gtk2 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 916e381ab4d..9c9352d3c29 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cpp-utilities, qttools, qtbase, cmake, pkgconfig }: +{ stdenv, fetchFromGitHub, cpp-utilities, qttools, qtbase, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "qtutilities"; diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index 68c4a95d0b6..5d7e94ff0aa 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file, libuv }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv }: stdenv.mkDerivation rec { pname = "raft-canonical"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0swn95cf11fqczllmxr0nj3ig532rw4n3w6g3ckdnqka8520xjyr"; }; - nativeBuildInputs = [ autoreconfHook file pkgconfig ]; + nativeBuildInputs = [ autoreconfHook file pkg-config ]; buildInputs = [ libuv ]; preConfigure = '' diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index ea91c1507dc..52a0877e77f 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake }: +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake }: stdenv.mkDerivation rec { pname = "rapidjson"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; preConfigure = '' substituteInPlace CMakeLists.txt --replace "-Werror" "" diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index 1e2d954fa94..291454f1410 100644 --- a/pkgs/development/libraries/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}: +{stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}: let pname = "rarian"; version = "0.8.1"; @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 libxslt ] ++ (with perlPackages; [ perl XMLParser ]); configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ]; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index da595dfb3b6..0da318808f3 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }: +{ stdenv, fetchFromGitHub, zlib, perl, pkg-config, python, openssl }: stdenv.mkDerivation rec { pname = "rdkafka"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "12cc7l5vpxyrm8ca0cpm8sdl54hb8dranal8sz55r9y8igz1q1wb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib perl python openssl ]; diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index 0f8caecf808..ab35139ce71 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, librep, gtk2 }: +{ stdenv, fetchurl, pkg-config, autoreconfHook, librep, gtk2 }: with stdenv.lib; stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0hgkkywm8zczir3lqr727bn7ybgg71x9cwj1av8fykkr8pdpard9"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ]; propagatedBuildInputs = [ librep gtk2 ]; diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index 168b82eec16..74f4d693569 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig }: +{ stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { name = "resolv_wrapper-1.1.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "13k76l4s0v032xyyaf19qw6p4qc81ybx1wynkz2pzjhiljazsdpa"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = "A wrapper for the user, group and hosts NSS API"; diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index ee9bcea5e52..ca608c52543 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsamplerate, libsndfile, fftw +{ stdenv, fetchurl, pkg-config, libsamplerate, libsndfile, fftw , vamp-plugin-sdk, ladspaH }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "4f5b9509364ea876b4052fc390c079a3ad4ab63a2683aad09662fb905c2dc026"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix index d3710043e6f..381c58e3f7d 100644 --- a/pkgs/development/libraries/sbc/default.nix +++ b/pkgs/development/libraries/sbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsndfile }: +{ stdenv, fetchurl, pkg-config, libsndfile }: stdenv.mkDerivation rec { name = "sbc-1.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1jal98pnrjkzxlkiqy0ykh4qmgnydz9bmsp1jn581p5kddpg92si"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 712138b0edf..8d16ae10889 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, orc, pkgconfig, fetchpatch, autoreconfHook }: +{ stdenv, fetchurl, orc, pkg-config, fetchpatch, autoreconfHook }: stdenv.mkDerivation { name = "schroedinger-1.0.11"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ orc ]; doCheck = (!stdenv.isDarwin); diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index c240a19cca6..8408763b4fe 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { install ${dashD} -m755 libblas.so.${version} "$out/lib/libblas.so.${version}" ln -s libblas.so.${version} "$out/lib/libblas.so.3" ln -s libblas.so.${version} "$out/lib/libblas.so" - # Write pkgconfig alias. + # Write pkg-config alias. # See also openblas/default.nix mkdir $out/lib/pkgconfig cat < $out/lib/pkgconfig/blas.pc diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix index 175de67ad7e..0d8e3415e20 100644 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , boost , m4ri , gd @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix index 4e89aeebe2b..3f88d4de026 100644 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -233,8 +233,8 @@ let export CMAKE_PREFIX_PATH=${pybind11}/share/cmake/pybind11:$CMAKE_PREFIX_PATH substituteInPlace setup.py --replace "pybind11==2.2.4" "pybind11" substituteInPlace dolfin/jit/jit.py \ - --replace 'pkgconfig.exists("dolfin")' 'pkgconfig.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \ - --replace 'pkgconfig.parse("dolfin")' 'pkgconfig.parse("${dolfin}/lib/pkgconfig/dolfin.pc")' + --replace 'pkg-config.exists("dolfin")' 'pkg-config.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \ + --replace 'pkg-config.parse("dolfin")' 'pkg-config.parse("${dolfin}/lib/pkgconfig/dolfin.pc")' ''; buildInputs = [ dolfin diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index b6f367ff4fe..aa340b6dafa 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gfortran, pkgconfig +{ stdenv, lib, fetchurl, gfortran, pkg-config , blas, zlib, bzip2 , withGurobi ? false, gurobi , withCplex ? false, cplex }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { [ blas zlib bzip2 ] ++ lib.optional withGurobi gurobi ++ lib.optional withCplex cplex; - nativeBuildInputs = [ gfortran pkgconfig ]; + nativeBuildInputs = [ gfortran pkg-config ]; configureFlags = lib.optionals withGurobi [ "--with-gurobi-incdir=${gurobi}/include" "--with-gurobi-lib=-lgurobi${gurobi.libSuffix}" ] ++ lib.optionals withCplex [ "--with-cplex-incdir=${cplex}/cplex/include/ilcplex" "--with-cplex-lib=-lcplex${cplex.libSuffix}" ]; diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/pkgs/development/libraries/science/math/tensorflow/bin.nix index ad10a4333de..3f3e1871f43 100644 --- a/pkgs/development/libraries/science/math/tensorflow/bin.nix +++ b/pkgs/development/libraries/science/math/tensorflow/bin.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { chmod -R +w $out ${patchLibs} - # Write pkgconfig file. + # Write pkg-config file. mkdir $out/lib/pkgconfig cat > $out/lib/pkgconfig/tensorflow.pc << EOF Name: TensorFlow diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 88fd1ea82d3..bf8c596a795 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python3, wafHook }: +{ stdenv, fetchurl, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "serd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "168rn3m32c59qbar120f83ibcnnd987ij9p053kybgl7cmm6358c"; }; - nativeBuildInputs = [ pkgconfig python3 wafHook ]; + nativeBuildInputs = [ pkg-config python3 wafHook ]; meta = with stdenv.lib; { homepage = "http://drobilla.net/software/serd"; diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 92dde2111fc..c83ecaca7c0 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos -, pkgconfig, libiconv }: +, pkg-config, libiconv }: stdenv.mkDerivation rec { name = "serf-1.3.9"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"; }; - nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; buildInputs = [ apr openssl aprutil zlib libiconv ] ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos; diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index 77b9714066d..d6065c925e8 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkgconfig, xercesc, xml-security-c, xml-tooling-c }: +{ stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkg-config, xercesc, xml-security-c, xml-tooling-c }: stdenv.mkDerivation rec { pname = "shibboleth-sp"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1qb4dbz5gk10b9w1rf6f4vv7c2wb3a8bfzif6yiaq96ilqad7gdr"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ]; configureFlags = [ diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix index 9d0aca0ab14..77090a19ba3 100644 --- a/pkgs/development/libraries/silgraphite/default.nix +++ b/pkgs/development/libraries/silgraphite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig }: +{ stdenv, fetchurl, pkg-config, freetype, libXft, pango, fontconfig }: stdenv.mkDerivation rec { version = "2.3.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype libXft pango fontconfig]; NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2"; diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 564c32bf10d..60c454bc145 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freetype, cmake, python }: +{ stdenv, fetchurl, pkg-config, freetype, cmake, python }: stdenv.mkDerivation rec { version = "1.3.14"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1790ajyhk0ax8xxamnrk176gc9gvhadzy78qia4rd8jzm89ir7gr"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ freetype ]; patches = stdenv.lib.optionals stdenv.isDarwin [ ./macosx.patch ]; diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 3a34bf54c3c..335712ac35a 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, libGLU, libGL, makeWrapper }: +{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: stdenv.mkDerivation rec { name = "smpeg-svn${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL gtk2 libGLU libGL ]; - nativeBuildInputs = [ autoconf automake libtool m4 pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ]; preConfigure = '' touch NEWS AUTHORS ChangeLog @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { $out/include/smpeg/*.h wrapProgram $out/bin/smpeg-config \ - --prefix PATH ":" "${pkgconfig}/bin" \ + --prefix PATH ":" "${pkg-config}/bin" \ --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig" ''; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 7aa7cf3d452..2297fd07eb1 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -1,6 +1,6 @@ # alsaLib vorbis-tools python can be made optional -{ stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkgconfig, xlibsWrapper }: +{ stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }: stdenv.mkDerivation { name = "snack-2.2.10"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { postUnpack = ''sourceRoot="$sourceRoot/unix"''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python tcl tk vorbis-tools xlibsWrapper ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 188405365cd..d00af92335d 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig }: +{ stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { name = "socket_wrapper-1.2.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1wb3gq0rj5h92mhq6f1hb2qy4ypkxvn8y87ag88c7gc71nkpa1fx"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = "A library passing all socket communications through unix sockets"; diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index f8b1c102852..8e38b960480 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, openssl, pkgconfig, autoreconfHook }: +{ stdenv, fetchFromGitHub, glib, openssl, pkg-config, autoreconfHook }: stdenv.mkDerivation rec { pname = "sofia-sip"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib openssl ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with stdenv.lib; { description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification"; diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index 40ec30c6c85..861e1d76c1d 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc -, pkgconfig }: +, pkg-config }: stdenv.mkDerivation rec { name = "soprano-2.9.4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # We disable the Java backend, since we do not need them and they make the closure size much bigger buildInputs = [ qt4 clucene_core librdf_redland libiodbc ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = { homepage = "http://soprano.sourceforge.net/"; diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 8d69c328eed..fba7dd80642 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, coin3d, qtbase, cmake, pkgconfig }: +{ fetchFromGitHub, stdenv, coin3d, qtbase, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "soqt"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ coin3d qtbase ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { homepage = "https://github.com/coin3d/soqt"; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index eb91ec2986a..66803a066b5 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python3, serd, pcre, wafHook }: +{ stdenv, fetchurl, pkg-config, python3, serd, pcre, wafHook }: stdenv.mkDerivation rec { pname = "sord"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1mwh4qvp9q4vgrgg5bz9sgjhxscncrylf2b06h0q55ddwzs9hndi"; }; - nativeBuildInputs = [ pkgconfig python3 wafHook ]; + nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ pcre ]; propagatedBuildInputs = [ serd ]; diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 939371e9209..2e6a7ff2199 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, sqlite, expat, zlib, proj, geos, libspatialite, readosm }: +{ stdenv, fetchurl, pkg-config, sqlite, expat, zlib, proj, geos, libspatialite, readosm }: stdenv.mkDerivation rec { name = "spatialite-tools-4.1.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "14aqmhvab63ydbb82fglsbig7jw1wmci8jjvci07aavdhvh1pyrv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ sqlite expat zlib proj geos libspatialite readosm ]; configureFlags = [ "--disable-freexl" ]; diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 483b8eeb206..a3c0f7b2ad8 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -1,6 +1,6 @@ { stdenv , substituteAll -, pkgconfig +, pkg-config , fetchurl , python3Packages , gettext @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook gettext libtool diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index f7c3fc50fd7..cd48a591307 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw, speexdsp }: +{ stdenv, fetchurl, autoreconfHook, pkg-config, fftw, speexdsp }: stdenv.mkDerivation rec { name = "speex-1.2.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fftw speexdsp ]; # TODO: Remove this will help with immediate backward compatability diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 421b3ec08c4..75d8b7fbc93 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw }: +{ stdenv, fetchurl, autoreconfHook, pkg-config, fftw }: stdenv.mkDerivation rec { name = "speexdsp-1.2.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fftw ]; configureFlags = [ diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix index 008fb608ca0..40ef2772681 100644 --- a/pkgs/development/libraries/sphinxbase/default.nix +++ b/pkgs/development/libraries/sphinxbase/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , bison -, pkgconfig +, pkg-config , python27 # >= 2.6 , swig2 # 2.0 , multipleOutputs ? false #Uses incomplete features of nix! @@ -15,7 +15,7 @@ stdenv.mkDerivation (rec { sha256 = "0vr4k8pv5a8nvq9yja7kl13b5lh0f9vha8fc8znqnm8bwmcxnazp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ swig2 python27 bison ]; meta = { diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 22370cee448..03066e8990c 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -23,7 +23,7 @@ , perl , phodav , pixman -, pkgconfig +, pkg-config , polkit , python3 , spice-protocol @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { meson ninja perl - pkgconfig + pkg-config python3 python3.pkgs.pyparsing python3.pkgs.six diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 2e158b98b58..86aa56f6c30 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , pixman , alsaLib , openssl @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config spice-protocol python3 python3.pkgs.six diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index e8a3ca94434..7380838b78e 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ stdenv, fetchFromGitHub, pkg-config , openssl ? null, libpcap ? null }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # libsrtp.pc references -lcrypto -lpcap without -L propagatedBuildInputs = [ openssl libpcap ]; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index bf2522ca780..ec9a18ef476 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, libxcb, pkgconfig, xcbutil}: +{stdenv, fetchurl, libX11, libxcb, pkg-config, xcbutil}: let version = "0.12"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxcb xcbutil ]; meta = { diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix index bf3b6a9ffd1..d7dcdd50066 100644 --- a/pkgs/development/libraries/subunit/default.nix +++ b/pkgs/development/libraries/subunit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, check, cppunit, perl, pythonPackages }: +{ stdenv, fetchurl, pkg-config, check, cppunit, perl, pythonPackages }: # NOTE: for subunit python library see pkgs/top-level/python-packages.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1h7i5ifcx20qkya24j11nbwa829klw7dvnlljdgivgvcx6b20y80"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ check cppunit perl pythonPackages.wrapPython ]; propagatedBuildInputs = with pythonPackages; [ testtools testscenarios ]; diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix index 628ab7e28ef..c7320f7722b 100644 --- a/pkgs/development/libraries/svrcore/default.nix +++ b/pkgs/development/libraries/svrcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nss, nspr }: +{ stdenv, fetchurl, pkg-config, nss, nspr }: stdenv.mkDerivation rec { pname = "svrcore"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ nss nspr ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 7349d7f81eb..54c2b6fae0d 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, icu, clucene_core, curl }: +{ stdenv, fetchurl, pkg-config, icu, clucene_core, curl }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "14syphc47g6svkbg018nrsgq4z6hid1zydax243g8dx747vsi6nf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ icu clucene_core curl ]; prePatch = '' diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix index 89d676cf3a3..fe1bc5fcd59 100644 --- a/pkgs/development/libraries/taglib-sharp/default.nix +++ b/pkgs/development/libraries/taglib-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono }: +{ stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono }: stdenv.mkDerivation rec { pname = "taglib-sharp"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "12pk4z6ag8w7kj6vzplrlasq5lwddxrww1w1ya5ivxrfki15h5cp"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook which ]; + nativeBuildInputs = [ pkg-config autoreconfHook which ]; buildInputs = [ mono ]; dontStrip = true; diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index 455c761f6ee..a30d8d01c49 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, telepathy-glib, farstream, dbus-glib }: +{ stdenv, fetchurl, pkg-config, telepathy-glib, farstream, dbus-glib }: stdenv.mkDerivation rec { name = "${pname}-0.6.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call"; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index ee2f34776d6..ec9dfab120f 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus-glib, glib, python2, pkgconfig, libxslt +{ stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt , gobject-introspection, vala, glibcLocales }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; propagatedBuildInputs = [ dbus-glib glib ]; - nativeBuildInputs = [ pkgconfig libxslt gobject-introspection vala ]; + nativeBuildInputs = [ pkg-config libxslt gobject-introspection vala ]; buildInputs = [ glibcLocales python2 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index ff8ff83fb9a..888d98b957f 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python3Packages, dbus-glib, dbus +{ stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus , telepathy-farstream, telepathy-glib, fetchpatch }: let @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { sha256 = "bf8e2a09060addb80475a4938105b9b41d9e6837999b7a00e5351783857e18ad"; }; - nativeBuildInputs = [ cmake pkgconfig python ]; + nativeBuildInputs = [ cmake pkg-config python ]; propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; buildInputs = [ dbus-glib ]; checkInputs = [ dbus.daemon dbus-python ]; diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index 385b198a755..0c4fd9da147 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: let version = "3.34.0"; pname = "template-glib"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "1z9xkin5fyfh071ma9y045jcw83hgx33dfbjraw6cxk0qdmfysr1"; }; - buildInputs = [ meson ninja pkgconfig gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ]; + buildInputs = [ meson ninja pkg-config gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ]; nativeBuildInputs = [ glib gobject-introspection ]; mesonFlags = [ diff --git a/pkgs/development/libraries/thrift/0.10.nix b/pkgs/development/libraries/thrift/0.10.nix index d626673a227..25da474099c 100644 --- a/pkgs/development/libraries/thrift/0.10.nix +++ b/pkgs/development/libraries/thrift/0.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkgconfig, bison +{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkg-config, bison , flex, twisted }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost zlib libevent openssl python bison flex twisted ]; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 6abddbbdbe5..5a9547a959f 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkgconfig +{ stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkg-config , bison, flex, twisted , static ? stdenv.hostPlatform.isStatic }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; - nativeBuildInputs = [ cmake pkgconfig bison flex ]; + nativeBuildInputs = [ cmake pkg-config bison flex ]; buildInputs = [ boost zlib libevent openssl ] ++ stdenv.lib.optionals (!static) [ python twisted ]; diff --git a/pkgs/development/libraries/timezonemap/default.nix b/pkgs/development/libraries/timezonemap/default.nix index 131d66e45cc..6f561eac04e 100644 --- a/pkgs/development/libraries/timezonemap/default.nix +++ b/pkgs/development/libraries/timezonemap/default.nix @@ -1,7 +1,7 @@ { stdenv , autoreconfHook , fetchbzr -, pkgconfig +, pkg-config , gtk3 , glib , file @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook gobject-introspection ]; diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index 9c909d5e14d..7b6b0f9390e 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { }; patches = [ - # add pkgconfig file + # add pkg-config file ./2.6.2-add-pkgconfig.patch # https://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559 diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 1cbf4026cb8..1d04ce5a1b9 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, src, pkgconfig, tcl, libXft, patches ? [] +{ stdenv, lib, src, pkg-config, tcl, libXft, patches ? [] , enableAqua ? stdenv.isDarwin, darwin , ... }: @@ -31,7 +31,7 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit" ++ stdenv.lib.optional enableAqua "--enable-aqua"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optional enableAqua (with darwin.apple_sdk.frameworks; [ Cocoa ]); propagatedBuildInputs = [ tcl libXft ]; diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index 5b58bf41672..e970fb6786c 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, tokyocabinet, pkgconfig }: +{ fetchurl, stdenv, tokyocabinet, pkg-config }: stdenv.mkDerivation rec { name = "tokyotyrant-1.1.41"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "13xqcinhydqmh7231qlir6pymacjwcf98drybkhd9597kzxp1bs2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ tokyocabinet ]; doCheck = false; # FIXME diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index 266538d43c2..27498fdaaf8 100644 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, gobject-introspection, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "totem-pl-parser"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection ]; buildInputs = [ libxml2 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 0670fdcdbd1..dc6d30061d6 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -11,7 +11,7 @@ , tracker , meson , ninja -, pkgconfig +, pkg-config , vala , wrapGAppsHook , bzip2 @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index e37db9f2533..f883268cc28 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -4,7 +4,7 @@ , gettext , meson , ninja -, pkgconfig +, pkg-config , asciidoc , gobject-introspection , python3 @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config asciidoc gettext libxslt @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_45 python3 # for data-generators systemd # used for checks to install systemd user service - dbus # used for checks and pkgconfig to install dbus service/s + dbus # used for checks and pkg-config to install dbus service/s ]; buildInputs = [ diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index 722094f859c..f7ac1a57f4a 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, libogg }: +{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, libogg }: stdenv.mkDerivation { name = "tremor-unstable-2018-03-16"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ libogg ]; preConfigure = '' diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index cb8ee14535d..6ccd853de0a 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig +, autoreconfHook, pkg-config , libsndfile }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "1rq3yc8ygzdqid9zk6pixmm4w9sk2vrlx217lhn5bjaglv7iyf7x"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libsndfile ]; doCheck = false; # fails with "../build-scripts/test-driver: line 107: -Mstrict: command not found" diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix index aa2a88653bb..951e62cae0d 100644 --- a/pkgs/development/libraries/uci/default.nix +++ b/pkgs/development/libraries/uci/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchgit, pkgconfig, libubox }: +{ stdenv, cmake, fetchgit, pkg-config, libubox }: stdenv.mkDerivation { pname = "uci"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { hardeningDisable = [ "all" ]; cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ]; buildInputs = [ libubox ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = "OpenWrt Unified Configuration Interface"; diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 1c20ce6d9c8..5b1af300bab 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkg-config , openssl ? null, zlib ? null, gnutls ? null }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "6ac9f76c2af010f97e916e4bae1cece341dc64ca28e3881ff4ddc3bc334060d7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # disable flaky networking test postPatch = '' diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 085741a66f8..5420eb204e3 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkgconfig, glib, libsoup, gobject-introspection }: +{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkg-config, glib, libsoup, gobject-introspection }: stdenv.mkDerivation rec { version="0.5.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kkf670abkq5ikm3mqls475lydfsd9by1kv5im4k757xrl1br1d4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobject-introspection ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index e78e72bf9b8..62c105f3b90 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig }: +{ stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { name = "uid_wrapper-1.2.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0swm9d8l69dw7nbrw6xh7rdy7cfrqflw3hxshicsrhd9v03iwvqf"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = "A wrapper for the user, group and hosts NSS API"; diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index dca24c7f9ea..da5dc2fed7a 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl, ncurses }: +{ stdenv, lib, fetchFromGitHub, libtool, pkg-config, perl, ncurses }: stdenv.mkDerivation rec { pname = "unibilium-unstable"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ libtool ncurses ]; meta = with lib; { diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix index cea35519ad8..ce3dfa24faa 100644 --- a/pkgs/development/libraries/unicorn/default.nix +++ b/pkgs/development/libraries/unicorn/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , cmake }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0jgnyaq6ykpbg5hrwc0p3pargmr9hpzqfsj6ymp4k07pxnqal76j"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; meta = with stdenv.lib; { description = "Lightweight multi-platform CPU emulator library"; diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 2ac7c823e22..159296facc4 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 }: +{ stdenv, fetchurl, pkg-config, libusb1 }: stdenv.mkDerivation rec { pname = "usbredir"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libusb1 ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index e6696626cb5..40c551d826a 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, fetchFromGitHub -, gn, ninja, python, glib, pkgconfig, icu +, gn, ninja, python, glib, pkg-config, icu , xcbuild, darwin , fetchpatch }: @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { # to be exceeded NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess"; - nativeBuildInputs = [ gn ninja pkgconfig python ] + nativeBuildInputs = [ gn ninja pkg-config python ] ++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; buildInputs = [ glib icu ]; diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix index 782d324c8be..71e14a82c3e 100644 --- a/pkgs/development/libraries/v8/plv8_6_x.nix +++ b/pkgs/development/libraries/v8/plv8_6_x.nix @@ -4,7 +4,7 @@ # 2019-08-29, nixpkgs does not have v8 6.x, and v8_5 is bumped to 5.4.232, which # is a bit outdated. plv8 3.x is planned to support v8 7.x -{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig +{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkg-config , doCheck ? false , snapshot ? true }: @@ -158,7 +158,7 @@ stdenv.mkDerivation rec { use_custom_libcxx_for_host=false ''; - nativeBuildInputs = [ gn ninja pkgconfig ]; + nativeBuildInputs = [ gn ninja pkg-config ]; buildInputs = [ python glib ]; buildPhase = '' diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix index 6462bfd5e62..c9dba3d00c9 100644 --- a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix +++ b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, cmrt, libdrm, libva, libX11, libGL, wayland }: +{ stdenv, fetchurl, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }: stdenv.mkDerivation rec { pname = "intel-hybrid-driver"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ cmrt libdrm libva libX11 libGL wayland ]; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 94f96b867d5..66f6b1c6fa5 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkgconfig }: +{ stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkg-config }: stdenv.mkDerivation rec { pname = "libva-vdpau-driver"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "1m4is6lk580mppsx2mvdv1xifj6gvx724si4qynsm9qrdfdc9fby"; }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvdpau libGLU libGL libva ]; postPatch = '' diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index 1030aefc1a5..024976e0b0f 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, +{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, vapoursynth, nasm, fftwFloat }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0lngkvxnzn82rz558nvl96rvclrck07ja1pny7wcfixp9b68ppkn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoreconfHook nasm vapoursynth fftwFloat diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 050de50d797..58ed50f9bd9 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, makeWrapper +{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper , zimg, libass, python3, libiconv , ApplicationServices , ocrSupport ? false, tesseract ? null @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper ]; + nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ]; buildInputs = [ zimg libass (python3.withPackages (ps: with ps; [ sphinx cython ])) diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index c7f375c2078..0235912ce53 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt +{ stdenv, lib, fetchurl, pkg-config, libcdio, libxml2, popt , libiconv, darwin }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ypnb1vp49nmzp5571ynlz6n1gh90f23w3z4x95hb7c2p7pmylb7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 popt libiconv ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit DiskArbitration ]); diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 8951ed4b002..fd39d8b30bd 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, meson, ninja, pkgconfig, python3 +{ stdenv, fetchurl, cmake, meson, ninja, pkg-config, python3 , libGLU, epoxy, libX11, libdrm, mesa }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGLU epoxy libX11 libdrm mesa ]; - nativeBuildInputs = [ cmake meson ninja pkgconfig python3 ]; + nativeBuildInputs = [ cmake meson ninja pkg-config python3 ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index e0c58096cfa..a28f63cd3c4 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchFromGitHub -, gsasl, gnutls, pkgconfig, cmake, zlib, libtasn1, libgcrypt, gtk3 +, gsasl, gnutls, pkg-config, cmake, zlib, libtasn1, libgcrypt, gtk3 # this will not work on non-nixos systems , sendmailPath ? "/run/wrappers/bin/sendmail" }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gsasl gnutls zlib libtasn1 libgcrypt gtk3 ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; cmakeFlags = [ "-DVMIME_SENDMAIL_PATH=${sendmailPath}" diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index 6d1dc7d4786..a5eb2c83f94 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, lapack +{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, lapack , Accelerate, CoreGraphics, CoreVideo }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./disable-cpack.patch #disable the need of cpack/rpm ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ boost lapack ] ++ stdenv.lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 084b42c9a2d..85736b79b1f 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3 +{ stdenv, fetchgit, autoreconfHook, pkg-config, gettext, python3 , ncurses, swig, glib, util-linux, cryptsetup, nss, gpgme , autoconf, automake, libtool , buildPackages @@ -18,7 +18,7 @@ in stdenv.mkDerivation { outputs = [ "out" "man" "dev" "py" ]; - nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext swig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config gettext swig ]; buildInputs = [ autoreconfHook glib cryptsetup nss util-linux gpgme ncurses ]; diff --git a/pkgs/development/libraries/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix index 59d0acada13..6b65014103e 100644 --- a/pkgs/development/libraries/vte/2.90.nix +++ b/pkgs/development/libraries/vte/2.90.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk3, ncurses, gobject-introspection }: +{ stdenv, fetchurl, intltool, pkg-config, glib, gtk3, ncurses, gobject-introspection }: stdenv.mkDerivation rec { versionMajor = "0.36"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gobject-introspection intltool glib gtk3 ncurses ]; configureFlags = [ "--enable-introspection" ]; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 014b2615d5b..2ccc07c67a2 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -3,7 +3,7 @@ , fetchurl , fetchpatch , gettext -, pkgconfig +, pkg-config , meson , ninja , gnome3 @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 67ff1be075d..d84587b00d2 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig +{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkg-config , xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0w9i2pliw4ccmjyfzff4i2f3hxwsfd54jg7ahv2v634qmx59bsbi"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ python3 xlibsWrapper libxcb libXrandr libXext wayland ]; preConfigure = '' diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 2b18bc31a45..7ec8936267b 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -3,7 +3,7 @@ , fetchurl , fetchpatch , meson -, pkgconfig +, pkg-config , substituteAll , ninja , libffi @@ -57,12 +57,12 @@ stdenv.mkDerivation rec { ''; depsBuildBuild = [ - pkgconfig + pkg-config ]; nativeBuildInputs = [ meson - pkgconfig + pkg-config ninja ] ++ lib.optionals isCross [ wayland # For wayland-scanner during the build diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 66d5d50c9d8..23258aff3e9 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , wayland }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1rsdgvkkvxs3cjhpl6agvbkm53vm7k8rg127j9y2vn33m2hvg0lp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ wayland ]; diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 5fc466cec20..923329ab3fd 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , pugixml , wayland , libGL @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" ]; - nativeBuildInputs = [ cmake pkgconfig ] ++ optional docSupport doxygen; + nativeBuildInputs = [ cmake pkg-config ] ++ optional docSupport doxygen; buildInputs = [ pugixml wayland libGL libffi ]; outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ]; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index ed97e1c8a85..77650b322d7 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -7,7 +7,7 @@ , gperf , cmake , ninja -, pkgconfig +, pkg-config , gettext , gobject-introspection , libnotify @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { gperf ninja perl - pkgconfig + pkg-config python3 ruby glib # for gdbus-codegen diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 9fa64be4d53..0ababf305c8 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig, wxGTK +, pkg-config, wxGTK , ffmpeg_3, libexif , cairo, pango }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0agmmwg0zlsw1idygvqjpj1nk41akzlbdha0hsdk1k8ckz6niq8d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ wxGTK ffmpeg_3 libexif ]; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index deb7d19c0de..4e0481cc47d 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto +{ stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , libX11, cairo , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ] ++ optional withMesa libGLU; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 5db7cfc26ba..d1b0d56576b 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto +{ stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms @@ -36,7 +36,7 @@ stdenv.mkDerivation { ++ optional withMesa libGLU ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = optional stdenv.isDarwin AGL; diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index df90342a972..e77b0097d47 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, pkgconfig +{ stdenv, fetchFromGitHub, fetchurl, pkg-config , libXinerama, libSM, libXxf86vm , gtk2, gtk3 , xorgproto, gst_all_1, setfile @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ++ optional withWebKit webkitgtk ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = optional stdenv.isDarwin AGL; diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index 8b0e6811eff..a75b5c1270b 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , fetchurl -, pkgconfig +, pkg-config , libXinerama , libSM , libXxf86vm @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ++ optional withWebKit webkitgtk ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = optional stdenv.isDarwin AGL; diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index a496e3886d8..6028982d987 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib, libmagic }: +{ stdenv, fetchurl, pkg-config, xapian, perl, pcre, zlib, libmagic }: stdenv.mkDerivation rec { pname = "xapian-omega"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ xapian perl pcre zlib libmagic ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { description = "Indexer and CGI search front-end built on Xapian library"; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 5457487edcc..2cdf8850e2d 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig +{ stdenv, fetchgit, autoconf, automake, libtool, pkg-config , xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation { @@ -28,7 +28,7 @@ stdenv.mkDerivation { gperf libtool libxcb - pkgconfig + pkg-config xorg.utilmacros xorg.xcbutilimage xorg.xcbutilrenderutil diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix index 38d7d447e28..0ad18ff70d4 100644 --- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , libxslt , docbook_xsl , docbook_xml_dtd_43 @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config libxslt docbook_xsl docbook_xml_dtd_43 diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index c6faa4fc017..16f9e7edb69 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, wayland-protocols +, meson, ninja, pkg-config, wayland-protocols , pipewire, wayland, elogind, systemd, libdrm }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "12k92h9dmn1fyn8nzxk69cyv0gnb7g9gj7a66mw5dcl5zqnl07nc"; }; - nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ]; buildInputs = [ pipewire wayland elogind systemd libdrm ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 83b4dda0c6e..52f089126a9 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -3,7 +3,7 @@ , nixosTests , substituteAll , autoreconfHook -, pkgconfig +, pkg-config , libxml2 , glib , pipewire @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config libxml2 wrapGAppsHook ]; diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 4322278e2fd..f5aa4f397ab 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, xorg, alsaLib, libGLU, libGL, aalib +{ stdenv, fetchurl, fetchpatch, pkg-config, xorg, alsaLib, libGLU, libGL, aalib , libvorbis, libtheora, speex, zlib, perl, ffmpeg_3 , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager , libmpcdec @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "13clir4qxl2zvsvvjd9yv3yrdhsnvcn5s7ambbbn5dzy9604xcrj"; }; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index 3a784a2e38b..eb09b0e0859 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xalanc, xercesc, openssl, pkgconfig }: +{ stdenv, fetchurl, xalanc, xercesc, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "xml-security-c"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "--with-xalan" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xalanc xercesc openssl ]; meta = { diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index d5e1eb08fa4..8671c124ab2 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig +{ stdenv, fetchgit, autoreconfHook, pkg-config , boost, curl, openssl, log4shib, xercesc, xml-security-c }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 6d310443e70..f45979b847e 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool +{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkg-config, libgcrypt, libtool # nss_3_53 is used instead of the latest due to a number of issues: # https://github.com/lsh123/xmlsec/issues?q=is%3Aissue+is%3Aopen+nss , openssl, nss_3_53, lib, runCommandCC, writeText }: @@ -25,7 +25,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss_3_53 ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation { passthru.tests.libxmlsec1-crypto = runCommandCC "libxmlsec1-crypto-test" { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ self libxml2 libxslt libtool ]; } '' $CC $(pkg-config --cflags --libs xmlsec1) -o crypto-test ${writeText "crypto-test.c" '' diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix index 60d3defcb1f..bfe09b0e94c 100644 --- a/pkgs/development/libraries/yubico-pam/default.nix +++ b/pkgs/development/libraries/yubico-pam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config , asciidoc, libxslt, docbook_xsl , pam, yubikey-personalization, libyubikey, libykclient }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "10dq8dqi3jldllj6p8r9hldx9sank9n82c44w8akxrs1vli6nj3m"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc libxslt docbook_xsl ]; + nativeBuildInputs = [ autoreconfHook pkg-config asciidoc libxslt docbook_xsl ]; buildInputs = [ pam yubikey-personalization libyubikey libykclient ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index a0cb85ed71a..67d4320b898 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , fetchpatch -, pkgconfig +, pkg-config , meson , ninja , zstd @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 95f09f59504..37ab1b1ec47 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitLab , fetchpatch -, pkgconfig +, pkg-config , glib , sqlite , gobject-introspection @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { autoconf automake libtool - pkgconfig + pkg-config gettext gobject-introspection vala diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/development/libraries/zmqpp/default.nix index 98211e6e3eb..0a7438fbc32 100644 --- a/pkgs/development/libraries/zmqpp/default.nix +++ b/pkgs/development/libraries/zmqpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, zeromq }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, zeromq }: stdenv.mkDerivation rec { pname = "zmqpp"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; propagatedBuildInputs = [ zeromq ]; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 8e77c190247..eec969f99ca 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -108,7 +108,7 @@ with super; lgi = super.lgi.override({ nativeBuildInputs = [ - pkgs.pkgconfig + pkgs.pkg-config ]; buildInputs = [ pkgs.glib diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index 9e2d406303c..fae1c1731ae 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: +{ lib, stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkg-config }: stdenv.mkDerivation rec { pname = "yelp-tools"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 libxslt itstool gnome3.yelp-xsl ]; doCheck = true; diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index f562adb1dd0..85bf2fb4490 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, fuse, adb }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, fuse, adb }: stdenv.mkDerivation rec { pname = "adbfs-rootless"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse ]; postPatch = '' diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix index 08f25a53bf6..eca29dd2fab 100644 --- a/pkgs/development/mobile/webos/novacom.nix +++ b/pkgs/development/mobile/webos/novacom.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, webos, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, webos, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "novacom"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "12s6g7l20kakyjlhqpli496miv2kfsdp17lcwhdrzdxvxl6hnf4n"; }; - nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ]; + nativeBuildInputs = [ cmake pkg-config webos.cmake-modules ]; postInstall = '' install -Dm755 -t $out/bin ../scripts/novaterm diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix index c39f36b93f6..dc330ce6d4e 100644 --- a/pkgs/development/mobile/webos/novacomd.nix +++ b/pkgs/development/mobile/webos/novacomd.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, -webos, cmake, pkgconfig, +webos, cmake, pkg-config, libusb-compat-0_1 }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ]; + nativeBuildInputs = [ cmake pkg-config webos.cmake-modules ]; buildInputs = [ libusb-compat-0_1 ]; diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 36ba75df33f..8152327a61d 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -225,7 +225,7 @@ let }; vega-cli = super.vega-cli.override { - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ super.node-pre-gyp pixman diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index bf129c7bc44..93de77fb322 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, buildDunePackage, ocaml -, pkgconfig, cairo +, pkg-config, cairo }: buildDunePackage rec { @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "1ik4qf4b9443sliq2z7x9acd40rmzvyzjh3bh98wvjklxbb84a9i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo ]; doCheck = !(stdenv.isDarwin diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index 92a4ff9535c..9cb3a3d4cb8 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkgconfig, ncurses, integers }: +{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkg-config, ncurses, integers }: if !lib.versionAtLeast ocaml.version "4.02" then throw "ctypes is not available for OCaml ${ocaml.version}" @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "16brmdnz7wi2z25qqhd5s5blyq4app6jbv6g9pa4vyg6h0nzbcys"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib ncurses ]; propagatedBuildInputs = [ integers libffi ]; diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/pkgs/development/ocaml-modules/fontconfig/default.nix index 8f804988129..55e8e941895 100644 --- a/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, fontconfig, ocaml }: +{ stdenv, lib, fetchFromGitHub, pkg-config, fontconfig, ocaml }: stdenv.mkDerivation { name = "ocaml-fontconfig-20131103"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1fw6bzydmnyh2g4x35mcbg0hypnxqhynivk4nakcsx7prr8zr3yh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml fontconfig ]; makeFlags = [ "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${lib.getVersion ocaml}/site-lib/" diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index 145cc384529..29df5ce8f4e 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}: +{stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkg-config}: let pname = "gmetadom"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ocaml findlib gdome2 libxslt]; propagatedBuildInputs = [gdome2]; diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 02fd7004a56..232621ad83b 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: +{ stdenv, lib, fetchurl, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: if lib.versionAtLeast ocaml.version "4.04" then throw "lablgtk-2.14 is not available for OCaml ${ocaml.version}" else @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 2aa031f419c..09487ac9dad 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: +{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, libglade, gtksourceview }: let param = let check = lib.versionAtLeast ocaml.version; in @@ -23,7 +23,7 @@ stdenv.mkDerivation { pname = "lablgtk"; inherit (param) version src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index 767e087a7f0..1f6b0ad76b9 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pkgconfig, buildDunePackage, gtk3, cairo2 }: +{ lib, fetchurl, pkg-config, buildDunePackage, gtk3, cairo2 }: buildDunePackage rec { version = "3.1.1"; @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "1ygc1yh99gh44h958yffw1vxdlfpn799d4x1s36c2jfbi8f0dir2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ gtk3 cairo2 ]; meta = { diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 759f0deedf1..83146ef9104 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchzip, pkgconfig, ncurses, libev, buildDunePackage, ocaml +{ lib, fetchzip, pkg-config, ncurses, libev, buildDunePackage, ocaml , cppo, ocaml-migrate-parsetree, ocplib-endian, result , mmap, seq }: @@ -14,7 +14,7 @@ buildDunePackage rec { sha256 = "15hgy3220m2b8imipa514n7l65m1h5lc6l1hanqwwvs7ghh2aqp2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cppo ocaml-migrate-parsetree ] ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; propagatedBuildInputs = [ libev mmap ocplib-endian seq result ]; diff --git a/pkgs/development/ocaml-modules/magick/default.nix b/pkgs/development/ocaml-modules/magick/default.nix index 4fcf267e9c0..016c059573b 100644 --- a/pkgs/development/ocaml-modules/magick/default.nix +++ b/pkgs/development/ocaml-modules/magick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, which, pkgconfig, ocaml, findlib, imagemagick }: +{ stdenv, lib, fetchurl, which, pkg-config, ocaml, findlib, imagemagick }: if lib.versionAtLeast ocaml.version "4.06" then throw "magick is not available for OCaml ${ocaml.version}" @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0gn9l2qdr8gby2x8c2mb59x1kipb2plr45rbq6ymcxyi0wmzfh3q"; }; - nativeBuildInputs = [ which pkgconfig ]; + nativeBuildInputs = [ which pkg-config ]; buildInputs = [ ocaml findlib imagemagick ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 1411d32d40c..49c8fe5470b 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }: +{stdenv, lib, fetchurl, automake, ocaml, autoconf, gnum4, pkg-config, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }: let pname = "ocaml-cairo"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ ./META.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml automake gnum4 autoconf unzip findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ]; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 110f51cc079..1da80a2202d 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip +{ stdenv, lib, fetchurl, pkg-config, ncurses, ocaml, findlib, ocaml_pcre, camlzip , gnutls, nettle }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1x703mjqsv9nvffnkj5i36ij2s5zfvxxll2z1qj6a7p428b2yfnm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 4103b48a979..bbfa2e4f6b5 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: +{stdenv, lib, fetchurl, ocaml, pkg-config, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: let pname = "ocamlsdl"; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ocaml findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl]; - propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkgconfig ]; + propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkg-config ]; createFindlibDestdir = true; meta = { diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index e5d5a21cc8e..83668b30cec 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses, lwt }: +{ stdenv, lib, pkg-config, ocaml, findlib, fetchurl, curl, ncurses, lwt }: if lib.versionOlder ocaml.version "4.02" then throw "ocurl is not available for OCaml ${ocaml.version}" @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6"; }; - buildInputs = [ pkgconfig ocaml findlib ncurses ]; + buildInputs = [ pkg-config ocaml findlib ncurses ]; propagatedBuildInputs = [ curl lwt ]; createFindlibDestdir = true; meta = { diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 660282ad131..1b8f9d629e3 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, sqlite, pkgconfig, buildDunePackage }: +{ lib, fetchurl, sqlite, pkg-config, buildDunePackage }: buildDunePackage rec { pname = "sqlite3"; @@ -10,7 +10,7 @@ buildDunePackage rec { sha256 = "0sba74n0jvzxibrclhbpqscil36yfw7i9jj9q562yhza6rax9p82"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ sqlite ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 81ba44647e3..7c09e8cd9d7 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config, ocb-stubblr }: if !lib.versionAtLeast ocaml.version "4.03" then throw "tsdl is not available for OCaml ${ocaml.version}" @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ SDL2 ctypes ]; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index d937c95a972..bddf2a2448f 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, ocaml, findlib, pkgconfig, perl +, ocaml, findlib, pkg-config, perl , gmp }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inherit (source) version; src = fetchurl { inherit (source) url sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib perl ]; propagatedBuildInputs = [ gmp ]; diff --git a/pkgs/development/php-packages/event/default.nix b/pkgs/development/php-packages/event/default.nix index 781b5abbc38..940150ac986 100644 --- a/pkgs/development/php-packages/event/default.nix +++ b/pkgs/development/php-packages/event/default.nix @@ -18,7 +18,7 @@ buildPecl { ':' ''; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ openssl libevent ]; internalDeps = [ php.extensions.sockets ]; diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index 8f9eed0c1c3..f697b44affd 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -20,7 +20,7 @@ buildPecl { ]; configureFlags = [ "--with-imagick=${pkgs.imagemagick7.dev}" ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pcre' ]; meta.maintainers = lib.teams.php.members; diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix index b2d9333f294..3eb1da463b9 100644 --- a/pkgs/development/php-packages/memcached/default.nix +++ b/pkgs/development/php-packages/memcached/default.nix @@ -23,7 +23,7 @@ buildPecl { "--with-libmemcached-dir=${pkgs.libmemcached}" ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ cyrus_sasl zlib ]; meta.maintainers = lib.teams.php.members; diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 2ebdaa2f577..18bb515d15e 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -6,7 +6,7 @@ buildPecl { version = "1.9.0"; sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs"; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ cyrus_sasl icu64 diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix index 6ad3b778f82..edb1b97df24 100644 --- a/pkgs/development/php-packages/yaml/default.nix +++ b/pkgs/development/php-packages/yaml/default.nix @@ -8,7 +8,7 @@ buildPecl { configureFlags = [ "--with-yaml=${pkgs.libyaml}" ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; meta.maintainers = lib.teams.php.members; } diff --git a/pkgs/development/pure-modules/audio/default.nix b/pkgs/development/pure-modules/audio/default.nix index e99c87ec706..7f5d6412fbb 100644 --- a/pkgs/development/pure-modules/audio/default.nix +++ b/pkgs/development/pure-modules/audio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, portaudio, fftw, libsndfile, libsamplerate }: +{ stdenv, fetchurl, pkg-config, pure, portaudio, fftw, libsndfile, libsamplerate }: stdenv.mkDerivation rec { baseName = "audio"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "c1f2a5da73983efb5a54f86d57ba93713ebed20ff0c72de9b3467f10f2904ee0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure portaudio fftw libsndfile libsamplerate ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/avahi/default.nix b/pkgs/development/pure-modules/avahi/default.nix index 4745593cb7f..2bcc7407266 100644 --- a/pkgs/development/pure-modules/avahi/default.nix +++ b/pkgs/development/pure-modules/avahi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, avahi }: +{ stdenv, fetchurl, pkg-config, pure, avahi }: stdenv.mkDerivation rec { baseName = "avahi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "5fac8a6e3a54e45648ceb207ee0061b22eac8c4e668b8d53f13eb338b09c9160"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure avahi ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/csv/default.nix b/pkgs/development/pure-modules/csv/default.nix index 501271df8c0..2518424649b 100644 --- a/pkgs/development/pure-modules/csv/default.nix +++ b/pkgs/development/pure-modules/csv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "csv"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "fe7c4edebe8208c54d5792a9eefaeb28c4a58b9094d161a6dda8126f0823ab3c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/doc/default.nix b/pkgs/development/pure-modules/doc/default.nix index c009b23f4ee..b25cf7c6572 100644 --- a/pkgs/development/pure-modules/doc/default.nix +++ b/pkgs/development/pure-modules/doc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "doc"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "cfa880573941f37868269bcc443a09fecd2a141a78556383d2213f6c9f45ddd9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; diff --git a/pkgs/development/pure-modules/fastcgi/default.nix b/pkgs/development/pure-modules/fastcgi/default.nix index 622ea140f66..18d42aecf05 100644 --- a/pkgs/development/pure-modules/fastcgi/default.nix +++ b/pkgs/development/pure-modules/fastcgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, fcgi }: +{ stdenv, fetchurl, pkg-config, pure, fcgi }: stdenv.mkDerivation rec { baseName = "fastcgi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "aa5789cc1e17521c01f349ee82ce2a00500e025b3f8494f89a7ebe165b5aabc7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure fcgi ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/faust/default.nix b/pkgs/development/pure-modules/faust/default.nix index 1f5b443fe38..e513ecc567d 100644 --- a/pkgs/development/pure-modules/faust/default.nix +++ b/pkgs/development/pure-modules/faust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, faust, libtool }: +{ stdenv, fetchurl, pkg-config, pure, faust, libtool }: stdenv.mkDerivation rec { baseName = "faust"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "51278a3b0807c4770163dc2ce423507dcf0ffec9cd1c1fbc08426d07294f6ae0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure faust libtool ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/ffi/default.nix b/pkgs/development/pure-modules/ffi/default.nix index 8518c2cb01f..7a42cde6558 100644 --- a/pkgs/development/pure-modules/ffi/default.nix +++ b/pkgs/development/pure-modules/ffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, libffi }: +{ stdenv, fetchurl, pkg-config, pure, libffi }: stdenv.mkDerivation rec { baseName = "ffi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0331f48efaae40af21b23cf286fd7eac0ea0a249d08fd97bf23246929c0ea71a"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure libffi ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix index 9956c142daf..3fcf8118a84 100644 --- a/pkgs/development/pure-modules/gen/default.nix +++ b/pkgs/development/pure-modules/gen/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, - pkgconfig, pure, haskellPackages }: + pkg-config, pure, haskellPackages }: stdenv.mkDerivation rec { baseName = "gen"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; hsEnv = haskellPackages.ghcWithPackages (hsPkgs : [hsPkgs.language-c]); - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ hsEnv pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index 77173870bca..20dd048e945 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, freeglut, libGLU, libGL, xlibsWrapper }: +{ stdenv, fetchurl, pkg-config, pure, freeglut, libGLU, libGL, xlibsWrapper }: stdenv.mkDerivation rec { baseName = "gl"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "edd594222f89ae372067eda6679a37488986b9739b5b79b4a25ac48255d31bba"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure freeglut libGLU libGL xlibsWrapper ]; makeFlags = [ "libdir=${placeholder ''out''}/lib" diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index a70dbbd047a..6cb620a4525 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, - pkgconfig, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }: + pkg-config, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }: stdenv.mkDerivation rec { baseName = "glpk"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--with-gmp=yes" ]; }); - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure glpkWithExtras ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix index 998c8f1972a..ed919e94eea 100644 --- a/pkgs/development/pure-modules/gplot/default.nix +++ b/pkgs/development/pure-modules/gplot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, gnuplot }: +{ stdenv, fetchurl, pkg-config, pure, gnuplot }: stdenv.mkDerivation rec { baseName = "gplot"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "841ded98e4d1cdfaf78f95481e5995d0440bfda2d5df533d6741a6e7058a882c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure gnuplot ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix index 6c6a381f285..a0407577037 100644 --- a/pkgs/development/pure-modules/gsl/default.nix +++ b/pkgs/development/pure-modules/gsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pure, pkgconfig, gsl }: +{ stdenv, fetchurl, pure, pkg-config, gsl }: stdenv.mkDerivation rec { baseName = "gsl"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure gsl ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix index ff619226a81..55281957df6 100644 --- a/pkgs/development/pure-modules/gtk/default.nix +++ b/pkgs/development/pure-modules/gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, pure-ffi, gtk2 }: +{ stdenv, fetchurl, pkg-config, pure, pure-ffi, gtk2 }: stdenv.mkDerivation rec { baseName = "gtk"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "e659ff1bc5809ce35b810f8ac3fb7e8cadaaef13996537d8632e2f86ed76d203"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure pure-ffi gtk2 ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/liblo/default.nix b/pkgs/development/pure-modules/liblo/default.nix index a633ad7c1d7..864578ae007 100644 --- a/pkgs/development/pure-modules/liblo/default.nix +++ b/pkgs/development/pure-modules/liblo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, liblo }: +{ stdenv, fetchurl, pkg-config, pure, liblo }: stdenv.mkDerivation rec { baseName = "liblo"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "c2ba4d6f94489acf8a8fac73982ae03d5ad4113146eb1f7d6558a956c57cb8ee"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure liblo ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/lilv/default.nix b/pkgs/development/pure-modules/lilv/default.nix index 85a504c9082..12a15b41a08 100644 --- a/pkgs/development/pure-modules/lilv/default.nix +++ b/pkgs/development/pure-modules/lilv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, lilv, lv2, serd, sord, sratom }: +{ stdenv, fetchurl, pkg-config, pure, lilv, lv2, serd, sord, sratom }: stdenv.mkDerivation rec { baseName = "lilv"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "af20982fe43e8dce62d50bf7a78e461ab36c308325b123cddbababf0d3beaf9f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure lilv lv2 serd sord sratom ]; makeFlags = [ "CFLAGS=-I${lilv}/include/lilv-0" "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/lv2/default.nix b/pkgs/development/pure-modules/lv2/default.nix index 6e8f38cf2a9..590179516b5 100644 --- a/pkgs/development/pure-modules/lv2/default.nix +++ b/pkgs/development/pure-modules/lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, lv2 }: +{ stdenv, fetchurl, pkg-config, pure, lv2 }: stdenv.mkDerivation rec { baseName = "lv2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "721cacd831781d8309e7ecabb0ee7c01da17e75c5642a5627cf158bfb36093e1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure lv2 ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/midi/default.nix b/pkgs/development/pure-modules/midi/default.nix index 3e2a3993fc1..86303c057d3 100644 --- a/pkgs/development/pure-modules/midi/default.nix +++ b/pkgs/development/pure-modules/midi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, portmidi }: +{ stdenv, fetchurl, pkg-config, pure, portmidi }: stdenv.mkDerivation rec { baseName = "midi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "817ae9fa5f443a8c478a6770f36091e3cf99f3515c74e00d09ca958dead1e7eb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure portmidi ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/mpfr/default.nix b/pkgs/development/pure-modules/mpfr/default.nix index 13c9eee1bd9..a6496617558 100644 --- a/pkgs/development/pure-modules/mpfr/default.nix +++ b/pkgs/development/pure-modules/mpfr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "mpfr"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "39d2255c2c0c2d60ce727be178b5e5a06f7c92eb365976c49c4a34b1edc576e7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix index d064eeb0d41..20f87fb9fc6 100644 --- a/pkgs/development/pure-modules/octave/default.nix +++ b/pkgs/development/pure-modules/octave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, octave }: +{ stdenv, fetchurl, pkg-config, pure, octave }: stdenv.mkDerivation rec { baseName = "octave"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0l1mvmi3rpabzjcrk6p04rdn922mvdm9x67zby3dha5iiccc47q0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure octave ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/odbc/default.nix b/pkgs/development/pure-modules/odbc/default.nix index e95e1c3d1c1..8b69c3a28dc 100644 --- a/pkgs/development/pure-modules/odbc/default.nix +++ b/pkgs/development/pure-modules/odbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, libiodbc }: +{ stdenv, fetchurl, pkg-config, pure, libiodbc }: stdenv.mkDerivation rec { baseName = "odbc"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1907e9ebca11cc68762cf7046084b31e9e2bf056df85c40ccbcbe9f02221ff8d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure libiodbc ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/pandoc/default.nix b/pkgs/development/pure-modules/pandoc/default.nix index fc615690df1..beef19d7c5e 100644 --- a/pkgs/development/pure-modules/pandoc/default.nix +++ b/pkgs/development/pure-modules/pandoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, pandoc, gawk, getopt }: +{ stdenv, fetchurl, pkg-config, pure, pandoc, gawk, getopt }: stdenv.mkDerivation rec { baseName = "pandoc"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0f23a17549048ca3a8f4936ea9e931feb05997390b486850936b746996350cda"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pure ]; propagatedBuildInputs = [ pandoc gawk getopt ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; diff --git a/pkgs/development/pure-modules/rational/default.nix b/pkgs/development/pure-modules/rational/default.nix index be230141a4a..cfc11b7b0ee 100644 --- a/pkgs/development/pure-modules/rational/default.nix +++ b/pkgs/development/pure-modules/rational/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "rational"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "62cb4079a0dadd232a859e577e97e50e9718ccfcc5983c4d9c4c32cac7a9bafa"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/readline/default.nix b/pkgs/development/pure-modules/readline/default.nix index 24f64d94470..e112b3e3893 100644 --- a/pkgs/development/pure-modules/readline/default.nix +++ b/pkgs/development/pure-modules/readline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, readline }: +{ stdenv, fetchurl, pkg-config, pure, readline }: stdenv.mkDerivation rec { baseName = "readline"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "db8e6663b1c085466c09662fe86d952b6f4ffdafeecffe805c681ab91c910886"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure readline ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/sockets/default.nix b/pkgs/development/pure-modules/sockets/default.nix index e80d66f3ab8..75165be0447 100644 --- a/pkgs/development/pure-modules/sockets/default.nix +++ b/pkgs/development/pure-modules/sockets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "sockets"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "4f2769618ae5818cf6005bb08bcf02fe359a2e31998d12dc0c72f0494e9c0420"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/sql3/default.nix b/pkgs/development/pure-modules/sql3/default.nix index c658ee0c556..8c917c6285c 100644 --- a/pkgs/development/pure-modules/sql3/default.nix +++ b/pkgs/development/pure-modules/sql3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, sqlite }: +{ stdenv, fetchurl, pkg-config, pure, sqlite }: stdenv.mkDerivation rec { baseName = "sql3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "b9f79dd443c8ffc5cede51e2af617f24726f5c0409aab4948c9847e6adb53c37"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure sqlite ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/stldict/default.nix b/pkgs/development/pure-modules/stldict/default.nix index ae28055a2f9..fba4a2de444 100644 --- a/pkgs/development/pure-modules/stldict/default.nix +++ b/pkgs/development/pure-modules/stldict/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "stldict"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/stllib/default.nix b/pkgs/development/pure-modules/stllib/default.nix index 9d35794b190..6a7475a6913 100644 --- a/pkgs/development/pure-modules/stllib/default.nix +++ b/pkgs/development/pure-modules/stllib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "stllib"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix index 496da2a20ea..843c617c95f 100644 --- a/pkgs/development/pure-modules/tk/default.nix +++ b/pkgs/development/pure-modules/tk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, xlibsWrapper }: +{ stdenv, fetchurl, pkg-config, pure, tcl, tk, xlibsWrapper }: stdenv.mkDerivation rec { baseName = "tk"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "3b6e97e2d723d5a05bf25f4ac62068ac17a1fd81db03e1986366097bf071a516"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure tcl tk xlibsWrapper ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/xml/default.nix b/pkgs/development/pure-modules/xml/default.nix index ac4f1f0e6b0..62b41d28806 100644 --- a/pkgs/development/pure-modules/xml/default.nix +++ b/pkgs/development/pure-modules/xml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, libxml2, libxslt }: +{ stdenv, fetchurl, pkg-config, pure, libxml2, libxslt }: stdenv.mkDerivation rec { baseName = "xml"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "e862dec060917a285bc3befc90f4eb70b6cc33136fb524ad3aa173714a35b0f7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure libxml2 libxslt ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 594ac42018b..c2edbdcf6a3 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -4,7 +4,7 @@ , isPy27 , numpy , ffmpeg -, pkgconfig +, pkg-config }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ numpy ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ffmpeg ]; # Tests require downloading files from internet diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index aadf53e9925..a6e2e28c6f5 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy +{ lib, fetchPypi, buildPythonPackage, python, pkg-config, dbus, dbus-glib, isPyPy , ncurses, pygobject3, isPy3k }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { disabled = isPyPy; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus dbus-glib ] # My guess why it's sometimes trying to -lncurses. # It seems not to retain the dependency anyway. diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index 01ab12b1ab5..da9ad934032 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkgconfig, fuse }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, fuse }: buildPythonPackage rec { pname = "fuse-python"; @@ -10,7 +10,7 @@ buildPythonPackage rec { }; buildInputs = [ fuse ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # no tests in the Pypi archive doCheck = false; diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 46bafa43388..85744d29593 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchPypi , buildPythonPackage -, pkgconfig +, pkg-config , gtk3 , gobject-introspection , pygtk @@ -24,7 +24,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection ]; diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index a25c8551490..0dd68918aed 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchPypi, buildPythonPackage -, pkgconfig +, pkg-config , libgphoto2 }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "48b4c4ab70826d3ddaaf7440564d513c02d78680fa690994b0640d383ffb8a7d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgphoto2 ]; diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index c66ceedc3ce..30c26b19c08 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -3,7 +3,7 @@ , meson , ninja , stdenv -, pkgconfig +, pkg-config , python3 , pygobject3 , gobject-introspection @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 gobject-introspection gst-plugins-base diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 61c23ac2022..0ceeda04582 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkgs, pkgconfig, chardet, lxml }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pkgs, pkg-config, chardet, lxml }: buildPythonPackage rec { pname = "html5-parser"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ chardet lxml pkgs.libxml2 ]; doCheck = false; # No such file or directory: 'run_tests.py' diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 0caff884967..65ae47ed87b 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , nose -, pkgconfig +, pkg-config , libjpeg , libpng , libtiff @@ -21,7 +21,7 @@ buildPythonPackage rec { }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ nose libjpeg libpng libtiff libwebp ]; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/pkgs/development/python-modules/libasyncns/default.nix index 72147fb70f2..fc45622a671 100644 --- a/pkgs/development/python-modules/libasyncns/default.nix +++ b/pkgs/development/python-modules/libasyncns/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, fetchurl -, libasyncns, pkgconfig }: +, libasyncns, pkg-config }: buildPythonPackage rec { pname = "libasyncns-python"; @@ -13,7 +13,7 @@ buildPythonPackage rec { patches = [ ./libasyncns-fix-res-consts.patch ]; buildInputs = [ libasyncns ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; doCheck = false; # requires network access meta = with lib; { diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix index dafaf412f07..d54a176f686 100644 --- a/pkgs/development/python-modules/libversion/default.nix +++ b/pkgs/development/python-modules/libversion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkgconfig, libversion, pythonOlder }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, libversion, pythonOlder }: buildPythonPackage rec { pname = "libversion"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1h8x9hglrqi03f461lhw3wwz23zs84dgw7hx4laxcmyrgvyzvcq1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libversion ]; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/libvirt/5.9.0.nix b/pkgs/development/python-modules/libvirt/5.9.0.nix index c751734e153..1134d4f1c57 100644 --- a/pkgs/development/python-modules/libvirt/5.9.0.nix +++ b/pkgs/development/python-modules/libvirt/5.9.0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }: +{ lib, stdenv, buildPythonPackage, fetchgit, pkg-config, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0qvr0s7yasswy1s5cvkm91iifk33pb8s7nbb38zznc46706b358r"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvirt lxml ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index af0344b8009..d29cf5a7a85 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitLab, pkgconfig, lxml, libvirt, nose }: +{ lib, stdenv, buildPythonPackage, fetchFromGitLab, pkg-config, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "sha256-A3eRfzQAfubyPefDlq5bAiFJ/G90D2JKdJO2Em0wE00="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvirt lxml ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 35235aaab40..77ec8322d68 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkgconfig, pytest, fuse, attr, which +{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkg-config, pytest, fuse, attr, which , contextlib2, osxfuse }: @@ -23,7 +23,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = optionals stdenv.isLinux [ fuse ] ++ optionals stdenv.isDarwin [ osxfuse ]; diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index 17a9fb246bd..ed6ebb1af49 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver -, freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32 +, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32 , fetchpatch , enableGhostscript ? false, ghostscript ? null, gtk3 , enableGtk3 ? false, cairo @@ -39,7 +39,7 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ which sphinx ] ++ stdenv.lib.optional enableGhostscript ghostscript diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index f075ba47ce8..11ea3251e0a 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver -, freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection +, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection , certifi, pillow , enableGhostscript ? true, ghostscript ? null, gtk3 , enableGtk3 ? false, cairo @@ -32,7 +32,7 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ which sphinx ] ++ stdenv.lib.optional enableGhostscript ghostscript diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index cd2aac6275e..4aaaea40677 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv, sip, qtbase, pyqt5, poppler, pkgconfig, fetchpatch +{ buildPythonPackage, fetchPypi, lib, stdenv, sip, qtbase, pyqt5, poppler, pkg-config, fetchpatch , substituteAll }: @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; buildInputs = [ qtbase.dev poppler ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ sip pyqt5.dev ]; # no tests, just bindings for `poppler_qt5` diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 82f8f5da3d9..780c8c2df85 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { python3 = python; }; @@ -12,7 +12,7 @@ buildPythonPackage rec { sourceRoot = "apache-arrow-${version}/python"; - nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; + nativeBuildInputs = [ cmake cython pkg-config setuptools_scm ]; propagatedBuildInputs = [ numpy six ]; checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ]; diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 6ac0c776fcd..5e96f642c28 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }: buildPythonPackage rec { pname = "pyatspi"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "/4CTEv0ML2HhkcGBoaY4owtXm5G2gs+1oFU1pVJltD0="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ at-spi2-core diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index 74c8ecd92b1..6fc9d2af1cb 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie +{ lib, stdenv, fetchurl, bash, autoconf, automake, libtool, pkg-config, libcangjie , sqlite, buildPythonPackage, cython }: @@ -14,7 +14,7 @@ in buildPythonPackage { sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05"; }; - nativeBuildInputs = [ pkgconfig libtool autoconf automake cython ]; + nativeBuildInputs = [ pkg-config libtool autoconf automake cython ]; buildInputs = [ libcangjie sqlite ]; preConfigure = '' diff --git a/pkgs/development/python-modules/pygobject/3.36.nix b/pkgs/development/python-modules/pygobject/3.36.nix index 59e19227196..1cbf264d1e2 100644 --- a/pkgs/development/python-modules/pygobject/3.36.nix +++ b/pkgs/development/python-modules/pygobject/3.36.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection, +{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection, pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { "-Dpython=python${if isPy3k then "3" else "2" }" ]; - nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ]; + nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ]; buildInputs = [ glib gobject-introspection ] ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 68f1bfa7b26..b42a772ed73 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection, +{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection, pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ]; + nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ]; buildInputs = [ glib gobject-introspection ] ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 0b72561e870..cf4f9d5cfbb 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib, isPy3k, pythonAtLeast }: +{ stdenv, fetchurl, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }: buildPythonPackage rec { pname = "pygobject"; @@ -19,7 +19,7 @@ buildPythonPackage rec { configureFlags = [ "--disable-introspection" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; # in a "normal" setup, pygobject and pygtk are installed into the diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 0b3e99dd28b..f239647bafa 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz -, pkgconfig, doctest-ignore-unicode, mock, nose }: +, pkg-config, doctest-ignore-unicode, mock, nose }: buildPythonPackage rec { pname = "pygraphviz"; @@ -13,7 +13,7 @@ buildPythonPackage rec { extension = "zip"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ graphviz ]; checkInputs = [ doctest-ignore-unicode mock nose ]; diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 22a44ce7607..b3d84c21387 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, pkgconfig, gtk2, pygobject2, pycairo, pango +{ lib, stdenv, fetchurl, fetchpatch, python, pkg-config, gtk2, pygobject2, pycairo, pango , buildPythonPackage, libglade ? null, isPy3k }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango ] ++ stdenv.lib.optional (libglade != null) libglade; diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix index 947b5733a7e..57a21f1e178 100644 --- a/pkgs/development/python-modules/pygtksourceview/default.nix +++ b/pkgs/development/python-modules/pygtksourceview/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, python, buildPythonPackage, pkgconfig, pygobject2, glib, pygtk, gnome2 }: +{ lib, fetchurl, python, buildPythonPackage, pkg-config, pygobject2, glib, pygtk, gnome2 }: buildPythonPackage rec { pname = "pygtksourceview"; @@ -12,7 +12,7 @@ buildPythonPackage rec { patches = [ ./codegendir.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python pygobject2 glib pygtk gnome2.gtksourceview ]; meta = { diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 05cf0aba354..54abcddd5d8 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkgconfig, lndir, dbus, makeWrapper }: +{ stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkg-config, lndir, dbus, makeWrapper }: buildPythonPackage rec { pname = "PyQt-x11-gpl"; @@ -42,7 +42,7 @@ buildPythonPackage rec { "--verbose" ]; - nativeBuildInputs = [ pkgconfig lndir makeWrapper qt4 ]; + nativeBuildInputs = [ pkg-config lndir makeWrapper qt4 ]; buildInputs = [ qt4 dbus ]; propagatedBuildInputs = [ sip ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 0c32985cfaa..338b8f44e03 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,4 +1,4 @@ -{ lib, pythonPackages, pkgconfig +{ lib, pythonPackages, pkg-config , dbus , qmake, lndir , qtbase @@ -41,7 +41,7 @@ in buildPythonPackage rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ - pkgconfig + pkg-config qmake lndir sip diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 51506598ca1..262c5a17504 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -1,4 +1,4 @@ -{ lib, pythonPackages, pkgconfig +{ lib, pythonPackages, pkg-config , qmake, qtbase, qtsvg, qtwebengine , wrapQtAppsHook }: @@ -27,7 +27,7 @@ in buildPythonPackage rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ - pkgconfig + pkg-config qmake sip qtbase diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix index eff4dd58c1d..6834a78f428 100644 --- a/pkgs/development/python-modules/pysmbc/default.nix +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, fetchPypi -, samba, pkgconfig +, samba, pkg-config , setuptools }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "14b75f358ical7zzqh3g1qkh2dxwxn2gz7sah5f5svndqkd3z8jy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ setuptools samba ]; meta = with lib; { diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index bfd14ab3635..44e35a186e2 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , buildPythonPackage -, pkgconfig +, pkg-config , python , dbus-python , enlightenment @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ enlightenment.efl ]; diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index 51d544eb5f8..728d47b1f96 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, lib, isPy3k -, pkgconfig, igraph +, pkg-config, igraph , texttable }: buildPythonPackage rec { @@ -7,7 +7,7 @@ buildPythonPackage rec { version = "0.8.3"; disabled = !isPy3k; # fails to build - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ igraph ]; propagatedBuildInputs = [ texttable ]; diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix index 7c7151ed928..2c5357297ea 100644 --- a/pkgs/development/python-modules/python_openzwave/default.nix +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, fetchPypi, isPy3k -, pkgconfig +, pkg-config , systemd, libyaml, openzwave, cython, pyserial , six, pydispatcher, urwid }: @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ systemd libyaml openzwave cython ]; propagatedBuildInputs = [ six urwid pydispatcher pyserial ]; diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index 82ddb8c810b..d0054f7076a 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -6,7 +6,7 @@ , pytest , pycparser , psutil -, pkgconfig +, pkg-config , dotnetbuildhelpers , clang , glib @@ -53,7 +53,7 @@ buildPythonPackage rec { pytest pycparser - pkgconfig + pkg-config dotnetbuildhelpers clang diff --git a/pkgs/development/python-modules/roboschool/default.nix b/pkgs/development/python-modules/roboschool/default.nix index 9387f3775be..3e15f18a3dd 100644 --- a/pkgs/development/python-modules/roboschool/default.nix +++ b/pkgs/development/python-modules/roboschool/default.nix @@ -9,7 +9,7 @@ , assimp , gym , bullet-roboschool -, pkgconfig +, pkg-config , which }: @@ -32,7 +32,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config qtbase # needs the `moc` tool which ]; diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index 3cd6b2fe3cc..78ddb269f3d 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pkgconfig +, pkg-config , pytest , pytestrunner , cffi @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "a3b43e02d321c09eafa769a6fc2c156f555cab3a7db62175ef2fd21e16cdf20c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; checkInputs = [ pytest pytestrunner ]; propagatedBuildInputs = [ cffi secp256k1 ]; diff --git a/pkgs/development/python-modules/sentencepiece/default.nix b/pkgs/development/python-modules/sentencepiece/default.nix index 430e61399b2..dd324260f83 100644 --- a/pkgs/development/python-modules/sentencepiece/default.nix +++ b/pkgs/development/python-modules/sentencepiece/default.nix @@ -1,14 +1,14 @@ { buildPythonPackage , stdenv , sentencepiece -, pkgconfig +, pkg-config }: buildPythonPackage rec { pname = "sentencepiece"; inherit (sentencepiece) version src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ sentencepiece.dev ]; sourceRoot = "source/python"; diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index d7791fcf96c..568ce67d143 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { export LD=$CC ''; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ alsaLib ffmpeg_3 libv4l sqlite libvpx ]; propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix index 63ad1023b87..2035ce8b26b 100644 --- a/pkgs/development/python-modules/systemd/default.nix +++ b/pkgs/development/python-modules/systemd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkgconfig }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkg-config }: buildPythonPackage rec { pname = "systemd"; @@ -12,7 +12,7 @@ buildPythonPackage rec { }; buildInputs = [ systemd ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; doCheck = false; diff --git a/pkgs/development/python-modules/virtkey/default.nix b/pkgs/development/python-modules/virtkey/default.nix index 9ab89e9ac0d..072fd25c7f0 100644 --- a/pkgs/development/python-modules/virtkey/default.nix +++ b/pkgs/development/python-modules/virtkey/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xorgproto }: +{ lib, buildPythonPackage, fetchurl, pkg-config, gtk2, libX11, libXtst, libXi, libxkbfile, xorgproto }: let majorVersion = "0.63"; @@ -12,7 +12,7 @@ in buildPythonPackage rec { sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xorgproto ]; diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index dc15c1c01be..6649c5f6931 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -6,7 +6,7 @@ , libX11 , wxGTK , wxmac -, pkgconfig +, pkg-config , buildPythonPackage , pyopengl , isPy3k @@ -35,7 +35,7 @@ buildPythonPackage rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK libX11 ]) ++ (lib.optionals stdenv.isDarwin [ wxmac ]); diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index a1cee317e34..d72d4aa35d4 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -2,7 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi -, pkgconfig +, pkg-config , which , cairo , pango @@ -34,7 +34,7 @@ buildPythonPackage rec { doCheck = false; - nativeBuildInputs = [ pkgconfig which doxygen ] + nativeBuildInputs = [ pkg-config which doxygen ] ++ (if stdenv.isDarwin then [ wxmac ] else [ wxGTK ]); buildInputs = [ ncurses libintl ] diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix index 6d07f8b5e28..e4cb6ec79e0 100644 --- a/pkgs/development/python-modules/wxPython/4.1.nix +++ b/pkgs/development/python-modules/wxPython/4.1.nix @@ -3,7 +3,7 @@ , fetchPypi , buildPythonPackage , which -, pkgconfig +, pkg-config , python , isPy27 , pyopengl @@ -30,7 +30,7 @@ buildPythonPackage rec { # https://github.com/wxWidgets/Phoenix/issues/1316 doCheck = false; - nativeBuildInputs = [ which doxygen wxGTK pkgconfig ]; + nativeBuildInputs = [ which doxygen wxGTK pkg-config ]; buildInputs = [ wxGTK.gtk diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index 716b1372645..af7bb7692f6 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, fetchPypi, buildPythonPackage +{ lib, stdenv, pkg-config, fetchPypi, buildPythonPackage , buildPackages , zstd, pytest }: @@ -13,10 +13,10 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "/usr/bin/pkg-config" "${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config" + --replace "/usr/bin/pkg-config" "${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zstd ]; setupPyBuildFlags = [ diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 746e6eefe53..4c64d1693fa 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -246,7 +246,7 @@ let Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo.dev pkgs.x11 pkgs.fontconfig.lib ]; Cardinal = [ pkgs.which ]; chebpol = [ pkgs.fftw ]; - ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ]; + ChemmineOB = [ pkgs.openbabel pkgs.pkg-config ]; cit = [ pkgs.gsl_1 ]; curl = [ pkgs.curl.dev ]; data_table = [pkgs.zlib.dev] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; @@ -257,7 +257,7 @@ let fftwtools = [ pkgs.fftw.dev ]; Formula = [ pkgs.gmp ]; gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ]; - git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkgconfig ]; + git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkg-config ]; GLAD = [ pkgs.gsl_1 ]; glpkAPI = [ pkgs.gmp pkgs.glpk ]; gmp = [ pkgs.gmp.dev ]; @@ -279,7 +279,7 @@ let mvabund = [ pkgs.gsl_1 ]; mwaved = [ pkgs.fftw.dev ]; ncdf4 = [ pkgs.netcdf ]; - nloptr = [ pkgs.nlopt pkgs.pkgconfig ]; + nloptr = [ pkgs.nlopt pkgs.pkg-config ]; n1qn1 = [ pkgs.gfortran ]; odbc = [ pkgs.unixODBC ]; pander = [ pkgs.pandoc pkgs.which ]; @@ -330,7 +330,7 @@ let rtiff = [ pkgs.libtiff.dev ]; runjags = [ pkgs.jags ]; RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; - rzmq = [ pkgs.zeromq pkgs.pkgconfig ]; + rzmq = [ pkgs.zeromq pkgs.pkg-config ]; clustermq = [ pkgs.zeromq ]; SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; sdcTable = [ pkgs.gmp pkgs.glpk ]; @@ -386,42 +386,42 @@ let nat = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ]; - clustermq = [ pkgs.pkgconfig ]; + clustermq = [ pkgs.pkg-config ]; RMark = [ pkgs.which ]; RPushbullet = [ pkgs.which ]; RcppEigen = [ pkgs.libiconv ]; RCurl = [ pkgs.curl.dev ]; - R2SWF = [ pkgs.pkgconfig ]; + R2SWF = [ pkgs.pkg-config ]; rgl = [ pkgs.libGLU pkgs.libGLU.dev pkgs.libGL pkgs.xlibsWrapper ]; - RGtk2 = [ pkgs.pkgconfig ]; - RProtoBuf = [ pkgs.pkgconfig ]; - Rpoppler = [ pkgs.pkgconfig ]; - XML = [ pkgs.pkgconfig ]; - cairoDevice = [ pkgs.pkgconfig ]; - chebpol = [ pkgs.pkgconfig ]; - fftw = [ pkgs.pkgconfig ]; - gdtools = [ pkgs.pkgconfig ]; + RGtk2 = [ pkgs.pkg-config ]; + RProtoBuf = [ pkgs.pkg-config ]; + Rpoppler = [ pkgs.pkg-config ]; + XML = [ pkgs.pkg-config ]; + cairoDevice = [ pkgs.pkg-config ]; + chebpol = [ pkgs.pkg-config ]; + fftw = [ pkgs.pkg-config ]; + gdtools = [ pkgs.pkg-config ]; jqr = [ pkgs.jq.lib ]; - kza = [ pkgs.pkgconfig ]; - magick = [ pkgs.pkgconfig ]; - mwaved = [ pkgs.pkgconfig ]; - odbc = [ pkgs.pkgconfig ]; - openssl = [ pkgs.pkgconfig ]; - pdftools = [ pkgs.pkgconfig ]; - sf = [ pkgs.pkgconfig pkgs.sqlite.dev pkgs.proj.dev ]; - showtext = [ pkgs.pkgconfig ]; - spate = [ pkgs.pkgconfig ]; - stringi = [ pkgs.pkgconfig ]; - sysfonts = [ pkgs.pkgconfig ]; - systemfonts = [ pkgs.pkgconfig ]; - tesseract = [ pkgs.pkgconfig ]; - Cairo = [ pkgs.pkgconfig ]; + kza = [ pkgs.pkg-config ]; + magick = [ pkgs.pkg-config ]; + mwaved = [ pkgs.pkg-config ]; + odbc = [ pkgs.pkg-config ]; + openssl = [ pkgs.pkg-config ]; + pdftools = [ pkgs.pkg-config ]; + sf = [ pkgs.pkg-config pkgs.sqlite.dev pkgs.proj.dev ]; + showtext = [ pkgs.pkg-config ]; + spate = [ pkgs.pkg-config ]; + stringi = [ pkgs.pkg-config ]; + sysfonts = [ pkgs.pkg-config ]; + systemfonts = [ pkgs.pkg-config ]; + tesseract = [ pkgs.pkg-config ]; + Cairo = [ pkgs.pkg-config ]; CLVTools = [ pkgs.gsl ]; JMcmprsk = [ pkgs.gsl ]; mashr = [ pkgs.gsl ]; hadron = [ pkgs.gsl ]; AMOUNTAIN = [ pkgs.gsl ]; - Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ]; + Rsymphony = [ pkgs.pkg-config pkgs.doxygen pkgs.graphviz pkgs.subversion ]; tcltk2 = [ pkgs.tcl pkgs.tk ]; tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ]; gridGraphics = [ pkgs.which ]; diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index b4cfa356b27..a0f251bfe91 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgconfig, rustPlatform, fetchFromGitHub, openssl }: +{ lib, pkg-config, rustPlatform, fetchFromGitHub, openssl }: rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 8c75842d1b6..b8e456b1c1e 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, libopcodes}: +{stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python, libiberty, libopcodes}: stdenv.mkDerivation rec { pname = "kcov"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; preConfigure = "patchShebangs src/bin-to-c-source.py"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index cbc736e1a26..4cd16a80a94 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake -, pkgconfig, makeWrapper }: +, pkg-config, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "panopticon"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = with qt5; [ qt5.qtbase diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index d4a102ac097..6d9543e3836 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, mkDerivation # nativeBuildInputs -, qmake, pkgconfig +, qmake, pkg-config # Qt , qtbase, qtsvg, qtwebengine # buildInputs @@ -30,12 +30,12 @@ mkDerivation rec { --replace "include(lib_radare2.pri)" "" ''; - nativeBuildInputs = [ qmake pkgconfig python3 wrapQtAppsHook ]; + nativeBuildInputs = [ qmake pkg-config python3 wrapQtAppsHook ]; propagatedBuildInputs = [ python3.pkgs.pyside2 ]; buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ]; qmakeFlags = with python3.pkgs; [ - "CONFIG+=link_pkgconfig" + "CONFIG+=link_pkg-config" "PKGCONFIG+=r_core" # Leaving this enabled doesn't break build but generates errors # at runtime (to console) about being unable to load needed bits. diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index a3c02503b37..c6cc555e050 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub , buildPackages -, pkgconfig +, pkg-config , libusb-compat-0_1, readline, libewf, perl, zlib, openssl , libuv, file, libzip, xxHash , gtk2 ? null, vte ? null, gtkdialog ? null @@ -78,7 +78,7 @@ let enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ] ++ optional useX11 [ gtkdialog vte gtk2 ] ++ optional rubyBindings [ ruby ] diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index 1d2255027a4..1701abeb25f 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -9,7 +9,7 @@ , autoconf , automake , libtool -, pkgconfig +, pkg-config , bison , flex , groff @@ -145,7 +145,7 @@ in stdenv.mkDerivation rec { autoconf automake libtool - pkgconfig + pkg-config bison flex groff diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index 1443c31192d..e29f06fca8e 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, sqlite, pkgconfig, perl +{ stdenv, fetchgit, sqlite, pkg-config, perl , buildllvmsparse ? true , buildc2xml ? true , llvm ? null, libxml2 ? null @@ -16,7 +16,7 @@ stdenv.mkDerivation { sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [sqlite perl] ++ stdenv.lib.optional buildllvmsparse llvm ++ stdenv.lib.optional buildc2xml libxml2; diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index 945f6c80af5..29ee980b487 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libxml2, llvm }: +{ fetchurl, stdenv, pkg-config, libxml2, llvm }: stdenv.mkDerivation rec { name = "sparse-0.5.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sed -i Makefile -e "s|^PREFIX=.*$|PREFIX=$out|g" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 llvm ]; doCheck = true; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index d38f42e4b33..67adc2438c7 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkg-config , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ setupHook pkgconfig ]; + nativeBuildInputs = [ setupHook pkg-config ]; buildInputs = [] ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index e09277e498d..c73b7149a36 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchFromGitHub, git, pkgconfig }: +{ lib, python3, fetchFromGitHub, git, pkg-config }: # Note: # Conan has specific dependency demands; check @@ -72,7 +72,7 @@ in newPython.pkgs.buildPythonApplication rec { ]; checkInputs = [ - pkgconfig + pkg-config git ] ++ (with newPython.pkgs; [ codecov diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index a83281c4e96..c2ce00eee21 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }: +{ stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }: -assert guileSupport -> ( pkgconfig != null && guile != null ); +assert guileSupport -> ( pkg-config != null && guile != null ); let version = "4.2.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ./glibc-2.27-glob.patch ]; - nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; + nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkg-config ]; buildInputs = stdenv.lib.optionals guileSupport [ guile ]; configureFlags = stdenv.lib.optional guileSupport "--with-guile" diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index f01f38ecd23..213d43c735c 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }: +{ stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }: -assert guileSupport -> ( pkgconfig != null && guile != null ); +assert guileSupport -> ( pkg-config != null && guile != null ); let version = "4.3"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { ./impure-dirs.patch ]; - nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; + nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkg-config ]; buildInputs = stdenv.lib.optionals guileSupport [ guile ]; configureFlags = stdenv.lib.optional guileSupport "--with-guile" diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 890c457da05..74d96d4af00 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { # 0.45 update enabled tests but they are failing doCheck = false; - # checkInputs = [ ninja pkgconfig ]; + # checkInputs = [ ninja pkg-config ]; # checkPhase = "python ./run_project_tests.py"; postFixup = '' diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 628e0c4797b..ebdad7be8fa 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fuse3, pkgconfig, pcre }: +{ stdenv, fetchFromGitHub, fuse3, pkg-config, pcre }: stdenv.mkDerivation rec { pname = "tup"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1qd07h4wi0743l7z2vybfvhwp61g2p2pc5qhl40672ryl24nvd1d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse3 pcre ]; configurePhase = '' diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index 3008c15d848..cf2e565fe45 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform +{ stdenv, fetchFromGitHub, openssl, perl, pkg-config, rustPlatform , CoreServices, Security }: @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0i9xp7vd1rp6xgkbbrspm3qq4hxwfwa00di3k73z1x64d3d8r5fm"; - nativeBuildInputs = [ openssl perl pkgconfig ]; + nativeBuildInputs = [ openssl perl pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index 564c5dcbcb5..f7c806c89a3 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl , darwin }: @@ -17,7 +17,7 @@ buildRustPackage rec { cargoSha256 = "1w25k3bqmmcrhpkw510vbwph0rfmrzi2wby0z2rz1q4k1f9k486m"; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [] ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security ]) diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index 6a447dd57c9..a1ae7cfc86e 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkgconfig, Security +{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security , sqliteSupport ? true, sqlite , postgresqlSupport ? true, postgresql , mysqlSupport ? true, mysql, zlib, libiconv @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./cargo-lock.patch ]; cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ optional stdenv.isDarwin Security ++ optional (stdenv.isDarwin && mysqlSupport) libiconv diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 54c37fa6183..a5bbfbc9088 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool, gnome3 +{ stdenv, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3 , python2Packages }: python2Packages.buildPythonApplication rec { @@ -12,7 +12,7 @@ python2Packages.buildPythonApplication rec { sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"; }; - nativeBuildInputs = [ intltool pkgconfig libxslt.dev ]; + nativeBuildInputs = [ intltool pkg-config libxslt.dev ]; buildInputs = [ libxslt ]; configureFlags = [ "--disable-scrollkeeper" ]; diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix index c052db92e0c..c64ab8534da 100644 --- a/pkgs/development/tools/drm_info/default.nix +++ b/pkgs/development/tools/drm_info/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , libdrm, json_c, pciutils -, meson, ninja, pkgconfig +, meson, ninja, pkg-config }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0s4zp8xz21zcpinbcwdvg48rf0xr7rs0dqri28q093vfmllsk36f"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libdrm json_c pciutils ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 79c8236a065..beafe0654db 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -11,7 +11,7 @@ , gettext , libxml2 , libxslt -, pkgconfig +, pkg-config , xmlto , acl @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { gettext libxml2 libxslt - pkgconfig + pkg-config xmlto ]; diff --git a/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix index 71365c01bfd..a78b649aaea 100644 --- a/pkgs/development/tools/fmbt/default.nix +++ b/pkgs/development/tools/fmbt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, autoreconfHook, pkgconfig, makeWrapper +{ stdenv, fetchFromGitHub, python, autoreconfHook, pkg-config, makeWrapper , flex , gettext, libedit, glib, imagemagick, libxml2, boost, gnuplot, graphviz , tesseract, gts, libXtst @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1jb9nb2mipc5cg99a80dny4m06vz2zral0q30fv75rz2cb6ja4zp"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig flex makeWrapper + nativeBuildInputs = [ autoreconfHook pkg-config flex makeWrapper python.pkgs.wrapPython ]; buildInputs = [ python gettext libedit glib imagemagick libxml2 boost diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 3507131082e..004125adead 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, rustPlatform -, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2, libssh2 +, openssl, cmake, perl, pkg-config, zlib, curl, libgit2, libssh2 }: with rustPlatform; @@ -36,7 +36,7 @@ buildRustPackage rec { LIBGIT2_SYS_USE_PKG_CONFIG = true; LIBSSH2_SYS_USE_PKG_CONFIG = true; - nativeBuildInputs = [ cmake pkgconfig perl ]; + nativeBuildInputs = [ cmake pkg-config perl ]; buildInputs = [ openssl zlib curl libgit2 libssh2 ]; postBuild = '' diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 84b3d2a6b1e..76c75af2d5f 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage +{ stdenv, fetchFromGitHub, glfw, pkg-config, libXrandr, libXdamage , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi , libX11, libGLU, python3Packages, ensureNewerSourcesForZipFilesHook , Cocoa @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0v7x93b61ama0gmzlx1zc56jgi7bvzsfvbkfl82xzwf2h5g1zni7"; }; - nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook python3Packages.six ]; + nativeBuildInputs = [ pkg-config ensureNewerSourcesForZipFilesHook python3Packages.six ]; buildInputs = [ glfw libGLU glfw libXrandr libXdamage libXext libXrender libXinerama libXcursor libXxf86vm diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix index e0dc9ecda80..f63a46793a3 100644 --- a/pkgs/development/tools/gnome-desktop-testing/default.nix +++ b/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -1,7 +1,7 @@ { stdenv , glib , autoreconfHook -, pkgconfig +, pkg-config , systemd , fetchFromGitLab }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 492430cc7c7..303040768c7 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, libX11, libXcursor +{ stdenv, lib, fetchFromGitHub, scons, pkg-config, libX11, libXcursor , libXinerama, libXrandr, libXrender, libpulseaudio ? null , libXi ? null, libXext, libXfixes, freetype, openssl , alsaLib, libGLU, zlib, yasm ? null }: @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { sha256 = "19vrp5lhyvxbm6wjxzn28sn3i0s8j08ca7nani8l1nrhvlc8wi0v"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ scons libX11 libXcursor libXinerama libXrandr libXrender libXi libXext libXfixes freetype openssl alsaLib libpulseaudio diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 15233979e15..33572c70b13 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, guile, guile-lib, libffi, pkgconfig, glib }: +{ fetchurl, stdenv, guile, guile-lib, libffi, pkg-config, glib }: stdenv.mkDerivation rec { pname = "g-wrap"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # Note: Glib support is optional, but it's quite useful (e.g., it's used by # Guile-GNOME). diff --git a/pkgs/development/tools/halfempty/default.nix b/pkgs/development/tools/halfempty/default.nix index c8c267f9187..75628ded2d1 100644 --- a/pkgs/development/tools/halfempty/default.nix +++ b/pkgs/development/tools/halfempty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, util-linux, scowl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, util-linux, scowl }: stdenv.mkDerivation rec { pname = "halfempty"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0838pw0ccjvlxmjygzrnppz1fx1a10vjzdgjbxgb4wgpqjr8v6vc"; }; - nativeBuildInputs = [ pkgconfig util-linux ]; + nativeBuildInputs = [ pkg-config util-linux ]; buildInputs = [ glib ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index feaea18be18..5b07f982aac 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, pkgconfig, libftdi1 +, pkg-config, libftdi1 , python3, pypy3 # PyPy yields large improvements in build time and runtime performance, and @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sha256 = "0vxhqs2fampglg3xlfwb35229iv96kvlwp1gyxrdrmlpznhkqdrk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ passthru.pythonPkg libftdi1 ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix index 50a349d8ff7..8e549b54f1f 100644 --- a/pkgs/development/tools/icr/default.nix +++ b/pkgs/development/tools/icr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkgconfig, which +{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkg-config, which , openssl, readline, libyaml, zlib }: crystal.buildCrystalPackage rec { @@ -16,7 +16,7 @@ crystal.buildCrystalPackage rec { buildInputs = [ libyaml openssl readline zlib ]; - nativeBuildInputs = [ makeWrapper pkgconfig which ]; + nativeBuildInputs = [ makeWrapper pkg-config which ]; # tests are failing due to our sandbox doCheck = false; diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/development/tools/jo/default.nix index 8592e38de7f..c3553a5b501 100644 --- a/pkgs/development/tools/jo/default.nix +++ b/pkgs/development/tools/jo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkgconfig}: +{stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkg-config}: stdenv.mkDerivation rec { pname = "jo"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook pandoc pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pandoc pkg-config ]; meta = with stdenv.lib; { description = "A small utility to create JSON objects"; diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix index 6e7db6b35c6..01323281dfe 100644 --- a/pkgs/development/tools/kafkacat/default.nix +++ b/pkgs/development/tools/kafkacat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, zlib, rdkafka, yajl }: +{ stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl }: stdenv.mkDerivation rec { pname = "kafkacat"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0z3bw00s269myfd1xqksjyznmgp74xfs09xqlq347adsgby3cmfs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib rdkafka yajl ]; diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 4e104a79d5d..0846cc9d87a 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi1, check +{ stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check , libserialport, librevisa, doxygen, glibmm, python , version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4" }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libzip glib libusb1 libftdi1 check libserialport librevisa doxygen glibmm python ]; diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index e78afc1a861..d97afa5604f 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }: +{ stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }: stdenv.mkDerivation rec { name = "libsigrokdecode-0.5.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib python3 libsigrok check ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index 5c8924ee21b..d6f34a0a9d2 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib }: +{ stdenv, fetchurl, intltool, pkg-config, glib }: stdenv.mkDerivation { name = "gnu-mdk-1.3.0"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = "https://ftp.gnu.org/gnu/mdk/v1.3.0/mdk-1.3.0.tar.gz"; sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool glib ]; postInstall = '' mkdir -p $out/share/emacs/site-lisp/ diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 23235499cfb..1bf3a0c2832 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkgconfig, perl, guile, libxml2 }: +{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkg-config, perl, guile, libxml2 }: stdenv.mkDerivation rec { pname = "autogen"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; nativeBuildInputs = [ - which pkgconfig perl autoreconfHook/*patches applied*/ + which pkg-config perl autoreconfHook/*patches applied*/ ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # autogen needs a build autogen when cross-compiling buildPackages.buildPackages.autogen buildPackages.texinfo diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/development/tools/misc/awf/default.nix index b1e627e7aa8..24a04550428 100644 --- a/pkgs/development/tools/misc/awf/default.nix +++ b/pkgs/development/tools/misc/awf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkg-config , wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; buildInputs = [ gtk2 gtk3 ]; diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index 03539eb2cc8..e768bdde146 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }: +{ stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }: stdenv.mkDerivation rec { name = "babeltrace-1.5.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libuuid popt elfutils ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index 48ae364a26e..c49187273c4 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkgconfig +, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config , python, pythonPackages }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gcc-arm-embedded pkgconfig + gcc-arm-embedded pkg-config ]; buildInputs = [ diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix index 6ba8064c094..6491ff83ec7 100644 --- a/pkgs/development/tools/misc/bsdbuild/default.nix +++ b/pkgs/development/tools/misc/bsdbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }: +{ stdenv, fetchurl, perl, libtool, pkg-config, gettext, mandoc, ed }: stdenv.mkDerivation rec { pname = "bsdbuild"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl mandoc ed ]; - nativeBuildInputs = [ pkgconfig libtool gettext ]; + nativeBuildInputs = [ pkg-config libtool gettext ]; prePatch = '' #ignore unfamiliar flags diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index f8cad56f099..43392b2a89c 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }: +{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkg-config }: stdenv.mkDerivation rec { pname = "coccinelle"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = with ocamlPackages; [ ocaml findlib menhir ocaml_pcre pycaml - python ncurses pkgconfig + python ncurses pkg-config ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 53ba94c7e81..6ee366ae2c6 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -1,5 +1,5 @@ { stdenv -, pkgconfig +, pkg-config , fetchurl , meson , ninja @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { itstool meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix index 9af9ddc0df7..c570b1a7997 100644 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ b/pkgs/development/tools/misc/dfu-util/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 }: +{ stdenv, fetchurl, pkg-config, libusb1 }: stdenv.mkDerivation rec { pname = "dfu-util"; version = "0.10"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; src = fetchurl { diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 3894ed58728..8a315a61e98 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk2, runCommand +{ stdenv, fetchFromGitHub, popt, avahi, pkg-config, python, gtk2, runCommand , gcc, autoconf, automake, which, procps, libiberty_static , runtimeShell , sysconfDir ? "" # set this parameter to override the default value $out/etc @@ -17,8 +17,8 @@ let sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake which procps libiberty_static]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [popt avahi pkg-config python gtk2 autoconf automake which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index d1211c9fcec..198bbabb19f 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus-glib }: +{ stdenv, fetchurl, pkg-config, glib, dbus, dbus-glib }: stdenv.mkDerivation rec { name = "eggdbus-0.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib dbus dbus-glib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/fujprog/default.nix b/pkgs/development/tools/misc/fujprog/default.nix index e5cd2e0e2dd..3ec4d0f8efb 100644 --- a/pkgs/development/tools/misc/fujprog/default.nix +++ b/pkgs/development/tools/misc/fujprog/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , IOKit , libftdi1 , libusb-compat-0_1 @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index d9bac6e3c83..f77ab03b810 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,7 +1,7 @@ { stdenv, targetPackages # Build time -, fetchurl, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages +, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time , ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ./darwin-target-match.patch ]; - nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ]; + nativeBuildInputs = [ pkg-config texinfo perl setupDebugInfoDirs ]; buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile ] ++ stdenv.lib.optional pythonSupport python3 diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index b1e107368ba..e34b5733b22 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, bison, flex, gnome3 }: +{ stdenv, fetchurl, pkg-config, glib, bison, flex, gnome3 }: stdenv.mkDerivation rec { pname = "gob2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # configure script looks for d-bus but it is only needed for tests - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib bison flex ]; passthru = { diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index 182d28375b6..5a3cdad8040 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite, gppcscconnectionplugin +{ stdenv, fetchurl, pkg-config, globalplatform, pcsclite, gppcscconnectionplugin , makeWrapper }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ globalplatform pcsclite makeWrapper ]; postFixup = '' diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 6cdcce77ffd..2b2a8318947 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, pkgconfig }: +{stdenv, fetchurl, gtk2, pkg-config }: stdenv.mkDerivation { name = "gtkdialog-0.8.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; meta = { diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix index 82ee2917277..feda9faf59a 100644 --- a/pkgs/development/tools/misc/gtkperf/default.nix +++ b/pkgs/development/tools/misc/gtkperf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, pkgconfig, libintl }: +{ stdenv, fetchurl, gtk2, pkg-config, libintl }: stdenv.mkDerivation { name = "gtkperf-0.40.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libintl ]; # https://openbenchmarking.org/innhold/7e9780c11550d09aa67bdba71248facbe2d781db diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix index 10ecd8174af..837128e2977 100644 --- a/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/pkgs/development/tools/misc/hydra-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, openssl, fetchFromGitHub, rustPlatform, darwin }: +{ stdenv, lib, pkg-config, openssl, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "hydra-cli"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index eb8ffb47285..7aaee31b504 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -1,5 +1,5 @@ { stdenv, nix, perlPackages, buildEnv, fetchFromGitHub -, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx +, makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx , top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar @@ -92,7 +92,7 @@ in stdenv.mkDerivation rec { gzip bzip2 lzma gnutar unzip git top-git mercurial /*darcs*/ gnused breezy ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 19556aeafc0..9f442cfee14 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, xorgproto, udev +{ stdenv, fetchurl, pkg-config, libdrm, libpciaccess, cairo, xorgproto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod , procps, utilmacros, gtk-doc, openssl, peg, elfutils }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "04fx7xclhick3k7fyk9c4mn8mxzf1253j1r0hrvj9sl40j7lsia0"; }; - nativeBuildInputs = [ pkgconfig utilmacros ]; + nativeBuildInputs = [ pkg-config utilmacros ]; buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod libXext libXv libXrandr glib bison libunwind python3 procps gtk-doc openssl peg elfutils ]; diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index fa413511dc0..ea82b0a4e6e 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, gperf, ncurses, pythonPackages }: +{ stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, pythonPackages }: stdenv.mkDerivation rec { basename = "kconfig-frontends"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ]; configureFlags = [ diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 03e370aeeb4..87cf20c0cb8 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }: +{ stdenv, fetchurl, pkg-config, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }: stdenv.mkDerivation rec { pname = "lttng-tools"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1g0g7ypxvc7wd5x4d4ixmfgl9yk0lxax3ymm95hcjwxn5p497r6w"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ popt libuuid liburcu lttng-ust libxml2 kmod ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index abcc476d594..ab5fa418dc7 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk2, popt, babeltrace }: +{ stdenv, fetchurl, pkg-config, glib, gtk2, popt, babeltrace }: stdenv.mkDerivation rec { name = "lttv-1.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 popt babeltrace ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index 0e28f729fe9..0990b8d9733 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2, gnome3 }: +{ stdenv, fetchurl, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }: stdenv.mkDerivation rec { pname = "msitools"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac"; }; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkg-config ]; buildInputs = [ glib libgsf libuuid gcab bzip2 ]; passthru = { diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index 84f6c330f8c..9b8f01b24e7 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.29.2"; src = fetchurl { - url = "https://pkgconfig.freedesktop.org/releases/${pname}-${version}.tar.gz"; + url = "https://pkg-config.freedesktop.org/releases/${pname}-${version}.tar.gz"; sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg"; }; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 843059b3356..9c4fa708910 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }: +{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkg-config, glib, openssl, darwin }: rustPlatform.buildRustPackage rec { version = "0.2.14"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features=all" ]; nativeBuildInputs = [ - pkgconfig cargo rustc + pkg-config cargo rustc ]; buildInputs = [ openssl diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 616a1cbc3fb..fb9b1966015 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config , libmysqlclient, libaio }: @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "sysbench"; version = "1.0.20"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libmysqlclient libaio ]; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 0bf902eccff..b086b3cdc48 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv, jansson }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }: stdenv.mkDerivation { pname = "universal-ctags"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "14n3ix77rkhq6vq6kspmgjrmm0kg0f8cxikyqdq281sbnfq8bajn"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ]; + nativeBuildInputs = [ autoreconfHook pkg-config pythonPackages.docutils ]; buildInputs = [ jansson ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; # to generate makefile.in diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 18926a85528..5cbe627b553 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, makeWrapper +{ stdenv, lib, fetchurl, pkg-config, makeWrapper , libusb1, tcl, util-linux, coreutils, bash }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ libusb1 tcl ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; meta = with stdenv.lib; { description = "A mode switching tool for controlling 'multi-mode' USB devices"; diff --git a/pkgs/development/tools/nemiver/default.nix b/pkgs/development/tools/nemiver/default.nix index 191b1721349..2f51f0d9338 100644 --- a/pkgs/development/tools/nemiver/default.nix +++ b/pkgs/development/tools/nemiver/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , gnome3 , gtk3 , libxml2 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libxml2 intltool itstool - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix index 086cd818a46..82ed82a67bd 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchgit , autoreconfHook -, pkgconfig +, pkg-config , qtbase }: @@ -18,7 +18,7 @@ mkDerivation { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix index 349a6b10104..e9dd2f08d3a 100644 --- a/pkgs/development/tools/osslsigncode/default.nix +++ b/pkgs/development/tools/osslsigncode/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , autoreconfHook , libgsf -, pkgconfig +, pkg-config , openssl , curl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0iwxdzqan2bswz62pmwjcyh01vs6ifpdcannw3s192gqzac1lgg3"; }; - nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ]; + nativeBuildInputs = [ autoreconfHook libgsf pkg-config openssl curl ]; meta = with lib; { homepage = "https://github.com/mtrojnar/osslsigncode"; diff --git a/pkgs/development/tools/parsing/antlr/4.8.nix b/pkgs/development/tools/parsing/antlr/4.8.nix index 411364e203b..acf46a4401f 100644 --- a/pkgs/development/tools/parsing/antlr/4.8.nix +++ b/pkgs/development/tools/parsing/antlr/4.8.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, jre -, fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }: +, fetchFromGitHub, cmake, ninja, pkg-config, libuuid, darwin }: let version = "4.8"; @@ -18,7 +18,7 @@ let outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = stdenv.lib.optional stdenv.isLinux libuuid ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation; diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index b6cb2447710..0a9dfdec016 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, glib, pkgconfig, python, scons }: +{ lib, stdenv, fetchgit, glib, pkg-config, python, scons }: stdenv.mkDerivation { pname = "hammer"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib python scons ]; meta = with lib; { diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 22627f3df1b..31065758914 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -56,7 +56,7 @@ self: super: av = super.av.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig + pkgs.pkg-config ]; buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; } @@ -234,8 +234,8 @@ self: super: h5py = super.h5py.overridePythonAttrs ( old: if old.format != "wheel" then rec { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; + buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkg-config self.cython ]; configure_flags = "--hdf5=${pkgs.hdf5}"; postConfigure = '' ${self.python.executable} setup.py configure ${configure_flags} @@ -386,7 +386,7 @@ self: super: ); libvirt-python = super.libvirt-python.overridePythonAttrs ({ nativeBuildInputs ? [ ], ... }: { - nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkg-config ]; propagatedBuildInputs = [ pkgs.libvirt ]; }); @@ -421,7 +421,7 @@ self: super: lxml = super.lxml.overridePythonAttrs ( old: { - nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; + nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkg-config libxml2.dev libxslt.dev ]; buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; } ); @@ -452,7 +452,7 @@ self: super: ++ lib.optional stdenv.isDarwin [ Cocoa ]; nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig + pkgs.pkg-config ]; postPatch = '' @@ -637,7 +637,7 @@ self: super: pillow = super.pillow.overridePythonAttrs ( old: { - nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; + nativeBuildInputs = [ pkgs.pkg-config ] ++ old.nativeBuildInputs; buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; } ); @@ -706,7 +706,7 @@ self: super: nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython - pkgs.pkgconfig + pkgs.pkg-config pkgs.cmake ]; @@ -755,7 +755,7 @@ self: super: nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.meson pkgs.ninja - pkgs.pkgconfig + pkgs.pkg-config ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ @@ -822,7 +822,7 @@ self: super: pygobject = super.pygobject.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; } ); @@ -873,7 +873,7 @@ self: super: format = "other"; nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig + pkgs.pkg-config pkgs.qt5.qmake pkgs.xorg.lndir pkgs.qt5.qtbase @@ -1012,7 +1012,7 @@ self: super: pyzmq = super.pyzmq.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; } ); @@ -1117,7 +1117,7 @@ self: super: tables = super.tables.overridePythonAttrs ( old: { HDF5_DIR = "${pkgs.hdf5}"; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; } ); diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index ca346cd1f14..335b9bef4cd 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages -, fetchurl, pkgconfig +, fetchurl, pkg-config , libbfd, popt, zlib, linuxHeaders, libiberty_static , withGUI ? false, qt4 ? null }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --replace "/bin/cp" "${buildPackages.coreutils}/bin/cp" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libbfd zlib popt linuxHeaders libiberty_static ] ++ stdenv.lib.optionals withGUI [ qt4 ]; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 6974800e87f..8144bae48c8 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -10,7 +10,7 @@ , libxml2 , meson, ninja , pango -, pkgconfig +, pkg-config , polkit , shared-mime-info , systemd @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config shared-mime-info wrapGAppsHook gnome3.adwaita-icon-theme diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index c1f38a62418..c978d8bd96a 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, pkgconfig, gettext, runCommand, makeWrapper +{ fetchgit, pkg-config, gettext, runCommand, makeWrapper , elfutils, kernel, gnumake, python2, python2Packages }: @@ -17,7 +17,7 @@ let pname = "systemtap"; inherit version; src = fetchgit { inherit url rev sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ elfutils gettext python2 python2Packages.setuptools ]; enableParallelBuilding = true; }; diff --git a/pkgs/development/tools/pxview/default.nix b/pkgs/development/tools/pxview/default.nix index 30d109beb97..20049215a70 100644 --- a/pkgs/development/tools/pxview/default.nix +++ b/pkgs/development/tools/pxview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl, perlPackages, pxlib }: +{ lib, stdenv, fetchurl, pkg-config, perl, perlPackages, pxlib }: stdenv.mkDerivation rec { pname = "pxview"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pxlib perl ] ++ (with perlPackages; [ libxml_perl ]); - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = [ "--with-pxlib=${pxlib.out}" ]; diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index 5edd73eba95..a8973cd5084 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkgconfig, libunwind, python3 }: +{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkg-config, libunwind, python3 }: rustPlatform.buildRustPackage rec { pname = "py-spy"; diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 464178a11d6..ec3fcf9cd39 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }: +{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }: stdenv.mkDerivation rec { pname = "rtags"; version = "2.38"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ llvmPackages.llvm openssl emacs ] ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ] ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 63aadf4f1fc..4c2ee35bdf7 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -2,7 +2,7 @@ , lib , rustPlatform , fetchFromGitHub -, perl, pkgconfig, openssl, Security, libiconv, curl +, perl, pkg-config, openssl, Security, libiconv, curl }: rustPlatform.buildRustPackage rec { @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 1a5273feeca..9daa3b251e8 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, rustPlatform, pkgconfig, openssl +, rustPlatform, pkg-config, openssl # testing packages , cargo-insta # darwin dependencies @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { ''; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. # CFURLSetResourcePropertyForKey is defined in the headers but there's no diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 21b986f9a5d..3a4c4c44ae7 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config, libiconv, curl }: rustPlatform.buildRustPackage rec { pname = "cargo-generate"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1vngn9gbiv59wrq230qk2mv00bsbdfk2mi1iqpr736c5wj1caqld"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index 6f06648a057..56e38f78ca0 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, rustPlatform -, pkgconfig, curl, libgit2, openssl, Security }: +, pkg-config, curl, libgit2, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-raze"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1z20xc508a3slc1ii3hy09swvlyib14zwf9akxc0h24d5m48as1c"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl libgit2 openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index df30ec5d360..9da28921ea7 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, CoreServices, Security, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, CoreServices, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "17931z5nbigfzvvhr6k64s2j9p1sp9nvmy5fyf92j3ci02dplm5c"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ]; diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 882622bff7b..b2340b21689 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkgconfig +{ lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkg-config , darwin }: let @@ -16,7 +16,7 @@ in rustPlatform.buildRustPackage rec { cargoSha256 = "1n0sxkhcdg2rbzqd7826pa7sxlnn0c2sc8l6lc98xw21vvqisc8n"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gmp openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index dcb435d5140..fa9b39e84a7 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, runCommand, patchelf , fetchFromGitHub, rustPlatform, makeWrapper -, pkgconfig, curl, zlib, Security, CoreServices }: +, pkg-config, curl, zlib, Security, CoreServices }: let libPath = lib.makeLibraryPath [ @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1zkrrg5m0j9rk65g51v2zh404529p9z84qqb7bfyjmgiqlnh48ig"; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ curl zlib diff --git a/pkgs/development/tools/scaff/default.nix b/pkgs/development/tools/scaff/default.nix index 97f94e2d61b..2449769e07f 100644 --- a/pkgs/development/tools/scaff/default.nix +++ b/pkgs/development/tools/scaff/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitLab, pkgconfig, openssl }: +{ lib, rustPlatform, fetchFromGitLab, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "scaff"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1v6580mj70d7cqbjw32slz65lg6c8ficq5mdkfbivs63hqkv4hgx"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; meta = with lib; { diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index 79b4a6acdf6..b4173c7aebb 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, libsigrok, libsigrokdecode }: +{ lib, stdenv, fetchurl, pkg-config, glib, libsigrok, libsigrokdecode }: stdenv.mkDerivation rec { name = "sigrok-cli-0.7.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libsigrok libsigrokdecode ]; meta = with lib; { diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 5fd99f14074..987765a3217 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libelf, which, pkgconfig, freeglut +{ lib, stdenv, fetchFromGitHub, libelf, which, pkg-config, freeglut , avrgcc, avrlibc , libGLU, libGL , GLUT }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; - nativeBuildInputs = [ which pkgconfig avrgcc ]; + nativeBuildInputs = [ which pkg-config avrgcc ]; buildInputs = [ libelf freeglut libGLU libGL ] ++ stdenv.lib.optional stdenv.isDarwin GLUT; diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix index 009172d7725..ae9c7c83392 100644 --- a/pkgs/development/tools/sunxi-tools/default.nix +++ b/pkgs/development/tools/sunxi-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libusb1, zlib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libusb1, zlib }: stdenv.mkDerivation { name = "sunxi-tools-20181113"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1yhl6jfl2cws596ymkyhm8h9qkcvp67v8hlh081lsaqv1i8j9yig"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 zlib ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index 927b792b6ba..2dcc32e7389 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }: +{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkg-config, freetype, Carbon, AppKit, capstone }: stdenv.mkDerivation rec { pname = "tracy"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0s39kimpc03x48kh7lyhblfs8y4mdzcz3g7f806h90x7zndsmfxj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glfw capstone ] ++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ] diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index 73ab21716b7..a45ced8a492 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pantheon -, pkgconfig +, pkg-config , vala , gettext , wrapGAppsHook @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index 5c3b2abe4a4..315a896929d 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub -, cmake, git, pkgconfig, wget, zip +, cmake, git, pkg-config, wget, zip , qtbase, qtx11extras , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf @@ -26,7 +26,7 @@ mkDerivation { }) ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ git wget zip diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 48e3b39b955..fdf66004deb 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -8,7 +8,7 @@ , vulkan-headers , vulkan-loader , glslang -, pkgconfig +, pkg-config , xlibsWrapper , libxcb , libXrandr @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config cmake python3 ]; diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 5794f5cc335..0024c43e05d 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, lib, openssl, pkgconfig, stdenv, curl, Security +{ rustPlatform, fetchFromGitHub, lib, openssl, pkg-config, stdenv, curl, Security , runCommand }: @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { ''; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; cargoSha256 = "1wrfly7c3an1mjqm7v13mlvx57hwlcxfjijkimicck04q6qdhbp6"; cargoBuildFlags = [ "-p" pname ]; diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index c5e5190feb3..c2a70f2de29 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , rustPlatform -, pkgconfig +, pkg-config , libressl , curl , Security @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0fw04hgxxqsbp1pylp32yd087r9bb8bpa05v90qdshkgp6znfl9s"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ # LibreSSL works around segfault issues caused by OpenSSL being unable to diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 63f2b0e4933..2acbf13e278 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre -, libtool, pkgconfig, openssl +, libtool, pkg-config, openssl , confFile ? config.watchman.confFile or null , withApple ? stdenv.isDarwin, CoreServices }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal"; }; - nativeBuildInputs = [ autoconf automake pkgconfig libtool ]; + nativeBuildInputs = [ autoconf automake pkg-config libtool ]; buildInputs = [ pcre openssl ] ++ lib.optionals withApple [ CoreServices ]; diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix index 152094b4498..6c68f0d18e2 100644 --- a/pkgs/development/web/kcgi/default.nix +++ b/pkgs/development/web/kcgi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, fetchFromGitHub, libbsd }: +{ lib, stdenv, pkg-config, fetchFromGitHub, libbsd }: stdenv.mkDerivation rec { pname = "kcgi"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { --replace /usr/local / ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libbsd ] ; dontAddPrefix = true; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 4358d6134e8..5308149c26b 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser -, pkgconfig, which +, pkg-config, which # Updater dependencies , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell , gnupg @@ -28,7 +28,7 @@ let "--shared-${name}-libpath=${getLib sharedLibDeps.${name}}/lib" /** Closure notes: we explicitly avoid specifying --shared-*-includes, * as that would put the paths into bin/nodejs. - * Including pkgconfig in build inputs would also have the same effect! + * Including pkg-config in build inputs would also have the same effect! */ ]) (builtins.attrNames sharedLibDeps) ++ [ "--with-intl=system-icu" @@ -55,7 +55,7 @@ in buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] ++ [ zlib libuv openssl http-parser icu ]; - nativeBuildInputs = [ which util-linux pkgconfig python ] + nativeBuildInputs = [ which util-linux pkg-config python ] ++ optionals stdenv.isDarwin [ xcbuild ]; configureFlags = let diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index 59db90741d3..847943d83bc 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, meson, ninja, pkgconfig, fetchFromGitHub, glib, vala, ctpl +{ lib, stdenv, meson, ninja, pkg-config, fetchFromGitHub, glib, vala, ctpl , libgee, libsoup, fcgi }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "15lnk91gykm60rv31x3r1swp2bhzl3gwp12mf39smzi4bmf7h38f"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ glib vala ctpl libgee libsoup fcgi ]; meta = with lib; { diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix index fd296d37f87..b264b216298 100644 --- a/pkgs/development/web/woff2/default.nix +++ b/pkgs/development/web/woff2/default.nix @@ -1,4 +1,4 @@ -{ brotli, cmake, pkgconfig, fetchFromGitHub, lib, stdenv +{ brotli, cmake, pkg-config, fetchFromGitHub, lib, stdenv , static ? stdenv.hostPlatform.isStatic }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # Need to explicitly link to brotlicommon patches = stdenv.lib.optional static ./brotli-static.patch; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DCANONICAL_PREFIXES=ON" diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index f98fbdf298c..ae0b2180a80 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { # Delete shipped libraries which we don't need. rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} - # Workaround invalid pkgconfig name for mozjs - mkdir pkgconfig - ln -s ${spidermonkey_38}/lib/pkgconfig/* pkgconfig/mozjs-38.pc + # Workaround invalid pkg-config name for mozjs + mkdir pkg-config + ln -s ${spidermonkey_38}/lib/pkgconfig/* pkg-config/mozjs-38.pc PKG_CONFIG_PATH="$PWD/pkgconfig:$PKG_CONFIG_PATH" # Update Makefiles diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 5f5948ed0bf..7375f45eb6d 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook, fuse }: +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, fuse }: stdenv.mkDerivation { name = "afuse-0.4.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1sfhicmxppkvdd4z9klfn63snb71gr9hff6xij1gzk94xg6m0ycc"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse ]; meta = { diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 54d7ce6222a..602d4278183 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }: +{ stdenv, fetchurl, lib, pkg-config, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }: stdenv.mkDerivation rec { pname = "alsa-plugins"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0z9k3ssbfk2ky2w13avgyf202j1drsz9sv3834bp33cj1i2hc3qw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # ToDo: a52, etc.? buildInputs = diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 4feb99f6bef..c4fdbacf95b 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, pkgconfig, gtk2, gtk3, fltk13 }: +{ lib, stdenv, fetchurl, alsaLib, pkg-config, gtk2, gtk3, fltk13 }: # Comes from upstream as as bundle of several tools, # some use gtk2, some gtk3 (and some even fltk13). @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0jbkjmq038zapj66a7nkppdf644v2mwj581xbmh6k4i8w6mcglxz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib gtk2 gtk3 fltk13 ]; patchPhase = '' diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 8455374fc68..ee167b31c96 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, makeWrapper, autoreconfHook -, pkgconfig, which +, pkg-config, which , flex, bison , linuxHeaders ? stdenv.cc.libc.linuxHeaders , gawk @@ -67,7 +67,7 @@ let autoreconfHook bison flex - pkgconfig + pkg-config swig ncurses which @@ -154,7 +154,7 @@ let src = apparmor-sources; nativeBuildInputs = [ - pkgconfig + pkg-config libapparmor gawk which @@ -206,7 +206,7 @@ let name = "apparmor-pam-${apparmor-version}"; src = apparmor-sources; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ libapparmor pam ]; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 7af451c1545..96040f2828c 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: +{ lib, stdenv, fetchurl, pkg-config, gpsd, libcap, libnl }: let cfg = import ./version.nix; in @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256.${pname}; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gpsd libcap libnl ]; preBuild = '' - makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" + makeFlags="PREFIX=$out PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" ''; meta = { diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index ba9b5d09d8d..079624c10ad 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libnl }: +{ lib, stdenv, fetchurl, pkg-config, libnl }: let cfg = import ./version.nix; in @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256.${pname}; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnl ]; preBuild = '' - makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" + makeFlags="PREFIX=$out PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" ''; meta = { diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index be7435fb1d0..29dceecad6e 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -6,7 +6,7 @@ , glib , json_c , libical -, pkgconfig +, pkg-config , python3 , readline , systemd @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config python3.pkgs.wrapPython ]; diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index a79926c0158..d692e30a03f 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , meson , ninja -, pkgconfig +, pkg-config , fetchFromGitLab , fetchpatch , python3 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config ] ++ lib.optional (!doCheck) python3; buildInputs = [ diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index afddb963cef..8edd9257fed 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, cmake, pkgconfig, flex, bison +, cmake, pkg-config, flex, bison , llvmPackages, kernel, elfutils , libelf, libbfd, libbpf, libopcodes, bcc }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { libbpf libbfd libopcodes ]; - nativeBuildInputs = [ cmake pkgconfig flex bison ] + nativeBuildInputs = [ cmake pkg-config flex bison ] # libelf is incompatible with elfutils-libelf ++ lib.filter (x: x != libelf) kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index 8aa1bf48892..dc0b13ef59b 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , python3, boost, fuse, libtorrent-rasterbar, curl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1cfjhyn9cjyyxyd0f08b2ra258pzkljwvkj0iwrjpd0nrbl6wkq5"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ boost fuse libtorrent-rasterbar curl python3 ]; diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index fa9cd34c1b3..026a20ddf9a 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkgconfig +{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config , kerberos, keyutils, pam, talloc }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q"; }; - nativeBuildInputs = [ autoreconfHook docutils pkgconfig ]; + nativeBuildInputs = [ autoreconfHook docutils pkg-config ]; buildInputs = [ kerberos keyutils pam talloc ]; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 2df08dbb2b5..61b66c6c861 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, pkgconfig, cmake +{ config, lib, stdenv, fetchFromGitHub, pkg-config, cmake # dependencies , glib, libXinerama @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib libXinerama ] ++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ] ++ optional ncursesSupport ncurses diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index c41f1410b01..0b14398e58f 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, flex, bison, pkgconfig, libmnl, libnfnetlink +{ fetchurl, lib, stdenv, flex, bison, pkg-config, libmnl, libnfnetlink , libnetfilter_conntrack, libnetfilter_queue, libnetfilter_cttimeout , libnetfilter_cthelper, systemd , libtirpc @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libmnl libnfnetlink libnetfilter_conntrack libnetfilter_queue libnetfilter_cttimeout libnetfilter_cthelper systemd libtirpc ]; - nativeBuildInputs = [ flex bison pkgconfig ]; + nativeBuildInputs = [ flex bison pkg-config ]; meta = with lib; { homepage = "http://conntrack-tools.netfilter.org/"; diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index a970451e0dd..c337da2fe72 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkgconfig, python3Packages, wireless-regdb }: +{ lib, stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkg-config, python3Packages, wireless-regdb }: stdenv.mkDerivation rec { pname = "crda"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt libnl ]; nativeBuildInputs = [ - pkgconfig + pkg-config python3Packages.pycrypto ]; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 3c46595ed87..f48ed260c76 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables -, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig +, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config , which, python3, makeWrapper, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython ]; + nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython ]; buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet iptables ]; propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ]; diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index e678996a852..d0e685cd0fa 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, lvm2, json_c -, openssl, libuuid, pkgconfig, popt }: +, openssl, libuuid, pkg-config, popt }: stdenv.mkDerivation rec { pname = "cryptsetup"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "--with-crypto_backend=openssl" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lvm2 json_c openssl libuuid popt ]; doCheck = true; diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 74b35c50de5..bffc90260c1 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, docutils, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, docutils, meson, ninja, pkg-config , dbus, linuxHeaders, systemd }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ docutils meson ninja pkgconfig ]; + nativeBuildInputs = [ docutils meson ninja pkg-config ]; buildInputs = [ dbus linuxHeaders systemd ]; diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index fad9559cc63..d20b69775bf 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, directfb, zlib, libjpeg, xorgproto }: stdenv.mkDerivation { pname = "directvnc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "16x7mr7x728qw7nbi6rqhrwsy73zsbpiz8pbgfzfl2aqhfdiz88b"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ directfb zlib libjpeg xorgproto ]; diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index efe578c596b..ab183936895 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -1,7 +1,7 @@ { stdenv, lib , kernel , fetchurl -, pkgconfig, meson, ninja +, pkg-config, meson, ninja , libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap , doxygen, python3 , shared ? false }: @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { doxygen meson ninja - pkgconfig + pkg-config python3 python3.pkgs.sphinx ]; diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/os-specific/linux/dropwatch/default.nix index 915d79aabac..288dea85cc8 100644 --- a/pkgs/os-specific/linux/dropwatch/default.nix +++ b/pkgs/os-specific/linux/dropwatch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , libnl, readline, libbfd, ncurses, zlib }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1qmax0l7z1qik42c949fnvjh5r6awk4gpgzdsny8iwnmwzjyp8b8"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libbfd libnl ncurses readline zlib ]; # To avoid running into https://sourceware.org/bugzilla/show_bug.cgi?id=14243 we need to define: diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 183c82f467a..8c15ce825c0 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchgit , autoreconfHook -, pkgconfig +, pkg-config , dbus }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook ]; diff --git a/pkgs/os-specific/linux/erofs-utils/default.nix b/pkgs/os-specific/linux/erofs-utils/default.nix index ffa39dc5802..e1ff63bce77 100644 --- a/pkgs/os-specific/linux/erofs-utils/default.nix +++ b/pkgs/os-specific/linux/erofs-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, fuse, libuuid, lz4 }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, fuse, libuuid, lz4 }: stdenv.mkDerivation rec { pname = "erofs-utils"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "07hvijq2hsn3gg1kb8abrfk23n83j57yx8kyv4wqgwhhvd30myjc"; }; - buildInputs = [ autoreconfHook pkgconfig fuse libuuid lz4 ]; + buildInputs = [ autoreconfHook pkg-config fuse libuuid lz4 ]; configureFlags = [ "--enable-fuse" ]; diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 862deef5582..30f33262bc9 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, glib, gperf, util-linux, kmod}: +{lib, stdenv, fetchurl, pkg-config, glib, gperf, util-linux, kmod}: let s = # Generated upstream information rec { @@ -9,7 +9,7 @@ let sha256 = "1z6lfhhbjs6j7pbp6ybn17ywjsdl87ql6g1p3m2y26aa10cqcqc9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gperf util-linux kmod ]; diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index e1909eea894..72e886b91f5 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}: +{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86}: let s = # Generated upstream information { @@ -18,7 +18,7 @@ stdenv.mkDerivation { inherit (s) url sha256; }; - nativeBuildInputs = [ pkgconfig ncurses ]; + nativeBuildInputs = [ pkg-config ncurses ]; inherit buildInputs; preConfigure = '' diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 96ebaf178bf..25f541d7a00 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -11,7 +11,7 @@ , libiec61883 , libraw1394 , libxmlxx3 -, pkgconfig +, pkg-config , python3 , sconsPackages , which @@ -46,7 +46,7 @@ mkDerivation rec { nativeBuildInputs = [ desktop-file-utils sconsPackages.scons_3_1_2 - pkgconfig + pkg-config which python pyqt5 diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index e98de6bbe9e..c4649557b11 100644 --- a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: +{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: rustPlatform.buildRustPackage rec { pname = "firmware-manager"; version = "0.1.1"; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0x9604jsflqxvbkfp139mzjicpyx8v21139jj8bp88c14ngvmdlw"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ lzma openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ]; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index 9d6d3dc7a80..52fa4266577 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: let inherit (lib) optionals; diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index 3ca8f41be7c..84d9dd4f331 100644 --- a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, efibootmgr, makeWrapper }: +{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, efibootmgr, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0yjv3a8r01ks91gc33rdwqmw52cqqwhq9f3rvw2xv3h8cqa5hfz0"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ lzma openssl dbus ]; diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 9fcb29ab7bb..1b5a0e3bdff 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, autoreconfHook, pkgconfig, glib, libtool, pcre +{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, libtool, pcre , json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; + nativeBuildInputs = [ autoreconfHook pkg-config libtool ]; buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl libbsd ]; postPatch = '' diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index a4dfc7cad5f..c241ac02a64 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -2,7 +2,7 @@ , lib, stdenv , fetchurl , intltool -, pkgconfig +, pkg-config , portaudio , SDL2 , ffmpeg @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool - pkgconfig + pkg-config ] ++ lib.optionals (useGtk) [ wrapGAppsHook ] ++ lib.optionals (useQt) [ wrapQtAppsHook ] diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix index a24bf093f8c..70dab152c72 100644 --- a/pkgs/os-specific/linux/hal-flash/default.nix +++ b/pkgs/os-specific/linux/hal-flash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkgconfig, udisks2 }: +{ lib, stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkg-config, udisks2 }: stdenv.mkDerivation { name = "hal-flash-0.3.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0dw9bx190mrh0dycw4rfvfmwwvh2sgypffr99nfnr36b38jrd6y6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake dbus glib libtool udisks2 ]; preConfigure = "libtoolize && aclocal && autoconf && automake --add-missing"; diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 3364f013504..06b23bdf1f6 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }: +{ lib, stdenv, fetchurl, pkg-config, libnl, openssl, sqlite ? null }: stdenv.mkDerivation rec { pname = "hostapd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1mrbvg4v7vm7mknf0n29mf88k3s4a4qj6r4d51wq8hmjj1m7s7c8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnl openssl sqlite ]; patches = [ diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index 3f4a8e2348b..971a1abffdd 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake -, glib, gtk3, gtk-doc, libgudev, pkgconfig, systemd }: +, glib, gtk3, gtk-doc, libgudev, pkg-config, systemd }: stdenv.mkDerivation rec { pname = "iio-sensor-proxy"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gettext intltool libtool - pkgconfig + pkg-config ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index e40a8d9b406..14ddc21bb6b 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { pname = "ima-evm-utils"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1dhfw6d9z4dv82q9zg2g025hgr179kamz9chy7v5w9b71aam8jf8"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl attr keyutils asciidoc libxslt ]; patches = [ ./xattr.patch ]; diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 9d7c2baf1a6..980b1fad0df 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , patchelf , cmake -, pkgconfig +, pkg-config , intel-gmmlib , intel-graphics-compiler @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "19scbbr6jf3yp2v7z8xyzzm01g44jym7xfkf1dz64d5nhvjw6ig5"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ intel-gmmlib intel-graphics-compiler libva ]; diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 083c9aa726c..220a08d993c 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libmnl }: +{ lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { pname = "ipset"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "02mkp7vmsh609dcp02xi290sxmsgq2fsch3875dxkwfxkrl16p5p"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; configureFlags = [ "--with-kmod=no" ]; diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 33a956d2aa8..82157ffa079 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, pruneLibtoolFiles, flex, bison +{ lib, stdenv, fetchurl, pkg-config, pruneLibtoolFiles, flex, bison , libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap , nftablesCompat ? false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0rvp0k8a72h2snrdx48cfn75bfa0ycrd2xl3kjysbymq7q6gxx50"; }; - nativeBuildInputs = [ pkgconfig pruneLibtoolFiles flex bison ]; + nativeBuildInputs = [ pkg-config pruneLibtoolFiles flex bison ]; buildInputs = [ libmnl libnetfilter_conntrack libnfnetlink libnftnl libpcap ]; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 46146e90c7c..0079aa79a22 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns +, meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns , libcap, libidn2 }: @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; - nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns ]; + nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap ] ++ optional (!stdenv.hostPlatform.isMusl) libidn2; diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix index aab8c2c7c83..fbd4d8efdac 100644 --- a/pkgs/os-specific/linux/ipvsadm/default.nix +++ b/pkgs/os-specific/linux/ipvsadm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libnl, popt, gnugrep }: +{ lib, stdenv, fetchurl, pkg-config, libnl, popt, gnugrep }: stdenv.mkDerivation rec { pname = "ipvsadm"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "-lnl" "$(pkg-config --libs libnl-genl-3.0)" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnl popt ]; preBuild = '' diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 8fff7a27429..7cb05f7fe98 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, ncurses, libcap_ng }: stdenv.mkDerivation rec { pname = "irqbalance"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1677ap6z4hvwga0vb8hrvpc0qggyarg9mlg11pxywz7mq94vdx19"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib ncurses libcap_ng ]; LDFLAGS = "-lncurses"; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 6a33790eead..f1aa85cdd3f 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -2,7 +2,7 @@ , fetchgit , fetchpatch , autoreconfHook -, pkgconfig +, pkg-config , ell , coreutils , docutils @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook docutils - pkgconfig + pkg-config python3Packages.wrapPython ]; diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index 8572f8ebdb9..b1bce496614 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libnl, iptables }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libnl, iptables }: let sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = sourceAttrs.src; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libnl iptables ]; makeFlags = [ "-C" "src/usr" ]; diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 68aff5c9d8a..2119c10b9cf 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook, - gzip, bzip2, pkgconfig, flex, check, + gzip, bzip2, pkg-config, flex, check, pam, coreutils }: @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { buildInputs = [ check pam ]; - nativeBuildInputs = [ autoreconfHook pkgconfig flex ]; + nativeBuildInputs = [ autoreconfHook pkg-config flex ]; makeFlags = [ "setowner=" ]; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index de7d508c10e..b28e1659083 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,5 +1,5 @@ { lib, stdenv, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper -, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils +, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils , libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl , zlib, withGtk ? false, gtk2 ? null }: @@ -36,7 +36,7 @@ stdenv.mkDerivation { # perf refers both to newt and slang nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty audit makeWrapper pkgconfig python3 + flex bison libiberty audit makeWrapper pkg-config python3 ]; buildInputs = [ elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 9feb4fe9821..ef8296cf16f 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig +{ stdenv, lib, fetchurl, autoreconfHook, pkg-config , libxslt, xz, elf-header , withStatic ? stdenv.hostPlatform.isStatic }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "035wzfzjx4nwidk747p8n085mgkvy531ppn16krrajx2dkqzply1"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ]; + nativeBuildInputs = [ autoreconfHook pkg-config libxslt ]; buildInputs = [ xz ] ++ lib.optional stdenv.isDarwin elf-header; configureFlags = [ diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index ee6a108301b..f48895fc017 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -8,7 +8,7 @@ , libGLU, libGL , pango , pixman -, pkgconfig +, pkg-config , docbook_xsl , libxslt }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook docbook_xsl - pkgconfig + pkg-config ]; configureFlags = [ diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 147b82c82bf..6db3a9583ec 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkgconfig }: +{ lib, stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkg-config }: stdenv.mkDerivation { name = "kmscube-2018-06-17"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1q5b5yvyfj3127385mp1bfmcbnpnbdswdk8gspp7g4541xk4k933"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libdrm libX11 libGL mesa ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index c7586a7d871..30ec6cdc7b5 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, glib, pkgconfig, gtk2 }: +{ lib, stdenv, fetchurl, ncurses, glib, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "latencytop-0.5"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses glib gtk2 ]; meta = { diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix index 5060df1638b..c422f5e01bb 100644 --- a/pkgs/os-specific/linux/libatasmart/default.nix +++ b/pkgs/os-specific/linux/libatasmart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, udev, buildPackages }: +{ lib, stdenv, fetchurl, pkg-config, udev, buildPackages }: stdenv.mkDerivation rec { name = "libatasmart-0.19"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index c454fc5f3b1..2e497584fab 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , libelf, zlib , fetchpatch }: @@ -31,14 +31,14 @@ stdenv.mkDerivation rec { --replace '/bin/rm' 'rm' ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libelf zlib ]; sourceRoot = "source/src"; enableParallelBuilding = true; makeFlags = [ "PREFIX=$(out)" ]; - # FIXME: Multi-output requires some fixes to the way the pkgconfig file is + # FIXME: Multi-output requires some fixes to the way the pkg-config file is # constructed (it gets put in $out instead of $dev for some reason, with # improper paths embedded). Don't enable it for now. diff --git a/pkgs/os-specific/linux/libevdevc/default.nix b/pkgs/os-specific/linux/libevdevc/default.nix index cb21eeaa753..2417ef6da9d 100644 --- a/pkgs/os-specific/linux/libevdevc/default.nix +++ b/pkgs/os-specific/linux/libevdevc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, pkgconfig, glib, jsoncpp }: +{ lib, stdenv, fetchFromGitHub, coreutils, pkg-config, glib, jsoncpp }: stdenv.mkDerivation rec { name = "libevdevc"; diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix index f6171220fb6..b1f9bada315 100644 --- a/pkgs/os-specific/linux/libfabric/default.nix +++ b/pkgs/os-specific/linux/libfabric/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, libpsm2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, libpsm2 }: stdenv.mkDerivation rec { pname = "libfabric"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "17qq96mlfhbkbmsvbazhxzkjnh6x37xlh3r0ngp0rfqbl05z2pcr"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ] ; + nativeBuildInputs = [ pkg-config autoreconfHook ] ; buildInputs = [ libpsm2 ] ; diff --git a/pkgs/os-specific/linux/libgestures/default.nix b/pkgs/os-specific/linux/libgestures/default.nix index 9aaa1c2bce6..bface8118be 100644 --- a/pkgs/os-specific/linux/libgestures/default.nix +++ b/pkgs/os-specific/linux/libgestures/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, jsoncpp }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, jsoncpp }: stdenv.mkDerivation rec { name = "libgestures-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { --replace '$(DESTDIR)/usr/include' '$(DESTDIR)/include' ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib jsoncpp ]; diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 551352fa46c..b7d08344e40 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig +{ stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkg-config , pythonSupport ? false, swig ? null, python}: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook bison flex pkgconfig file ] + nativeBuildInputs = [ autoreconfHook bison flex pkg-config file ] ++ lib.optional pythonSupport swig; postBuild = lib.optionalString (pythonSupport) '' diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix index b7163617ce5..1ac4580b13f 100644 --- a/pkgs/os-specific/linux/libpsm2/default.nix +++ b/pkgs/os-specific/linux/libpsm2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, numactl, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, numactl, pkg-config }: stdenv.mkDerivation rec { pname = "libpsm2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ numactl pkgconfig ]; + buildInputs = [ numactl pkg-config ]; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix index 2a52e72cc91..14773d69440 100644 --- a/pkgs/os-specific/linux/libratbag/default.nix +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config , glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 , json-glib, libunistring }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gitMinimal swig check valgrind + meson ninja pkg-config gitMinimal swig check valgrind ]; buildInputs = [ diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 7a1b6539e5e..6582c6d8e8d 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pcre, pkgconfig, libsepol +{ lib, stdenv, fetchurl, pcre, pkg-config, libsepol , enablePython ? true, swig ? null, python3 ? null , fts }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0cr4p0qkr4qd5z1x677vwhz6mlz55kxyijwi2dmrvbhxcw7v78if"; }; - nativeBuildInputs = [ pkgconfig ] ++ optionals enablePython [ swig python3 ]; + nativeBuildInputs = [ pkg-config ] ++ optionals enablePython [ swig python3 ]; buildInputs = [ libsepol pcre fts ] ++ optionals enablePython [ python3 ]; # drop fortify here since package uses it by default, leading to compile error: diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index f995ea5e45c..d7255ac4587 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, audit +{ lib, stdenv, fetchurl, pkg-config, bison, flex, libsepol, libselinux, bzip2, audit , enablePython ? true, swig ? null, python ? null }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ] ++ optional enablePython "py"; - nativeBuildInputs = [ bison flex pkgconfig ]; + nativeBuildInputs = [ bison flex pkg-config ]; buildInputs = [ libsepol libselinux bzip2 audit ] ++ optionals enablePython [ swig python ]; diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 108568d0b51..46d0e94bb14 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, help2man, gettext +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, help2man, gettext , libxml2, perl, python3, doxygen }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i"; }; - nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkgconfig ]; + nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkg-config ]; buildInputs = [ python3 ]; diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix index 2168d482442..ec56a89ce88 100644 --- a/pkgs/os-specific/linux/lightum/default.nix +++ b/pkgs/os-specific/linux/lightum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkgconfig, systemd }: +{ lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }: stdenv.mkDerivation { name = "lightum-2014-06-07"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { libX11 libXScrnSaver libXext - pkgconfig + pkg-config systemd ]; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 65048ab4bd5..76a74299ae5 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchpatch , fetchurl -, pkgconfig +, pkg-config , util-linux , libuuid , thin-provisioning-tools, libaio @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "1l0fkn9abrgk5mfn6jfh9qhdr86b59l1c5pk6lp8jh0491d69las"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev libuuid thin-provisioning-tools libaio ]; configureFlags = [ diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 16e7ef0a804..4b66fcb76f7 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, perl, docbook2x +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, perl, docbook2x , docbook_xml_dtd_45, python3Packages, pam # Optional Dependencies @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook pkgconfig perl docbook2x python3Packages.wrapPython + autoreconfHook pkg-config perl docbook2x python3Packages.wrapPython ]; buildInputs = [ pam libapparmor gnutls libselinux libseccomp libcap diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 1f8b7f0143c..3503812966e 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse +{ config, lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, fuse , util-linux, makeWrapper , enableDebugBuild ? config.lxcfs.enableDebugBuild or false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1fp2q4y3ql4xd2lp4bpcl8s6xryr5xbb56da9d20w2cdr2d0lwyv"; }; - nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; + nativeBuildInputs = [ pkg-config help2man autoreconfHook ]; buildInputs = [ fuse makeWrapper ]; preConfigure = lib.optionalString enableDebugBuild '' diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix index e2230da3d2c..8545d31c71a 100644 --- a/pkgs/os-specific/linux/miraclecast/default.nix +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config , glib, readline, pcre, systemd, udev }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "05afqi33rv7k6pbkkw4mynj6p97vkzhhh13y5nh0yxkyhcgf45pm"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ glib pcre readline systemd udev ]; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index adeb71befe4..4784abc6c28 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }: +{ lib, stdenv, fetchurl, pkg-config, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }: stdenv.mkDerivation rec { pname = "multipath-tools"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { $(find * -name Makefile\*) ''; - nativeBuildInputs = [ gzip pkgconfig perl ]; + nativeBuildInputs = [ gzip pkg-config perl ]; buildInputs = [ systemd lvm2 libaio readline liburcu json_c ]; makeFlags = [ diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 708430da397..c2d2996c54d 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lib, pkgconfig, util-linux, libcap, libtirpc, libevent +{ stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers , python3, buildPackages, nixosTests, rpcsvc-proto , enablePython ? true @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # put it in the "lib" output, and the headers in "dev" outputs = [ "out" "dev" "lib" "man" ]; - nativeBuildInputs = [ pkgconfig buildPackages.stdenv.cc rpcsvc-proto ]; + nativeBuildInputs = [ pkg-config buildPackages.stdenv.cc rpcsvc-proto ]; buildInputs = [ libtirpc libcap libevent sqlite lvm2 diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 49b4da5c671..115c12ec5e4 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, bison, file, flex +{ lib, stdenv, fetchurl, pkg-config, bison, file, flex , asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl , libmnl, libnftnl, libpcap , gmp, jansson, readline @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig bison file flex + pkg-config bison file flex asciidoc docbook_xml_dtd_45 docbook_xsl findXMLCatalogs libxslt ]; diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix index a534ebaaac3..ba972bb6916 100644 --- a/pkgs/os-specific/linux/numatop/default.nix +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, numactl, ncurses, check }: +{ lib, stdenv, fetchurl, pkg-config, numactl, ncurses, check }: stdenv.mkDerivation rec { pname = "numatop"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1s7psq1xyswj0lpx10zg5lnppav2xy9safkfx3rssrs9c2fp5d76"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ numactl ncurses ]; checkInputs = [ check ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 4076a27ffc2..d5bbf40e2b8 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -1,6 +1,6 @@ nvidia_x11: sha256: -{ stdenv, lib, fetchFromGitHub, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau +{ stdenv, lib, fetchFromGitHub, pkg-config, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau , librsvg, wrapGAppsHook , withGtk2 ? false, withGtk3 ? true }: @@ -45,7 +45,7 @@ stdenv.mkDerivation { version = nvidia_x11.settingsVersion; inherit src; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ] ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index 621e6d1f54c..b5610d35dde 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config , dpdk, libconfig, libpcap, numactl, openssl, zlib, libbsd, libelf, jansson }: let dpdk_18_11 = dpdk.overrideAttrs (old: rec { @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ dpdk_18_11 diff --git a/pkgs/os-specific/linux/ofp/default.nix b/pkgs/os-specific/linux/ofp/default.nix index b392bf6f0ea..5defafeba80 100644 --- a/pkgs/os-specific/linux/ofp/default.nix +++ b/pkgs/os-specific/linux/ofp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , openssl, libpcap, odp-dpdk, dpdk }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "05902593fycgkwzk5g7wzgk0k40nrrgybplkdka3rqnlj6aydhqf"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl libpcap odp-dpdk dpdk ]; dontDisableStatic = true; diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 0adc6dbc3c2..cbd1bbdf763 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which , procps, libcap_ng, openssl, python3 , perl , kernel ? null }: @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { kernel = optional (_kernel != null) _kernel.dev; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper util-linux openssl libcap_ng pythonEnv perl procps which ]; diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index 59031d8a706..ddb5eff9723 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which , procps, libcap_ng, openssl, python2, iproute , perl , automake, autoconf, libtool, kernel ? null }: @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { kernel = optional (_kernel != null) _kernel.dev; - nativeBuildInputs = [ autoconf libtool automake pkgconfig ]; + nativeBuildInputs = [ autoconf libtool automake pkg-config ]; buildInputs = [ makeWrapper util-linux openssl libcap_ng python2 perl procps which ]; diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index 464a2b04b2b..7f26ae80ed6 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, util-linux }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, util-linux }: stdenv.mkDerivation rec { pname = "pam_mount"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace @@NIX_UTILLINUX@@ ${util-linux}/bin ''; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; buildInputs = [ pam libHX util-linux libxml2 pcre perl openssl cryptsetup ]; diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix index eece7b84c3d..bca02c17066 100644 --- a/pkgs/os-specific/linux/pam_pgsql/default.nix +++ b/pkgs/os-specific/linux/pam_pgsql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, postgresql, libgcrypt, pam }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, postgresql, libgcrypt, pam }: stdenv.mkDerivation rec { pname = "pam_pgsql"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1a68krq5m07zspdxwl1wmkr5j98zr9bdg4776kvplrsdcg97h4jk"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libgcrypt pam postgresql ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 852fb2d73ef..760af73fecd 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libfido2, pam, openssl }: +{ lib, stdenv, fetchurl, pkg-config, libfido2, pam, openssl }: stdenv.mkDerivation rec { pname = "pam_u2f"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01fwbrfnjkv93vvqm54jywdcxa1p7d4r32azicwnx75nxfbbzhqd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfido2 pam openssl ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index 57f0d97ae81..1a66e986d8b 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript, runtimeShell }: +{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkg-config, pmount, pythonPackages, writeScript, runtimeShell }: let @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper # pam_usb dependencies - dbus libxml2 pam pmount pkgconfig + dbus libxml2 pam pmount pkg-config # pam_usb's tools dependencies python # cElementTree is included with python 2.5 and later. diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index caa6b1848e7..1ef304c617f 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, meson, ninja, pkgconfig, gettext, fetchFromGitHub, python3 +{ lib, stdenv, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 , wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3 , gobject-introspection }: @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1nfjnsiwg2rs6gkjsxzhr2708i6di149dgwq3cf6l12rxqpb8arj"; }; - nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; + nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ]; diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 1e8bd3407d5..47ca709c44b 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkgconfig +{ stdenv, lib, fetchurl, meson, ninja, pkg-config , dpdk, libbsd, libpcap, lua5_3, numactl, util-linux , gtk2, which, withGtk ? false }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1clfviz1qa4hysslcg6i29vsxwl9f6j1y7zf9wwx9br3yq08x956"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ dpdk libbsd libpcap lua5_3 numactl which ] diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 88575580e2a..c167b202c8d 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxslt, docbook_xsl +{ stdenv, fetchurl, autoreconfHook, pkg-config, libxslt, docbook_xsl , gtk3, udev, systemd, lib }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook pkgconfig libxslt docbook_xsl + autoreconfHook pkg-config libxslt docbook_xsl ]; buildInputs = [ diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix index e5e8ea2feea..9e9cf149fef 100644 --- a/pkgs/os-specific/linux/pommed-light/default.nix +++ b/pkgs/os-specific/linux/pommed-light/default.nix @@ -4,7 +4,7 @@ , libconfuse , alsaLib , audiofile -, pkgconfig +, pkg-config , zlib , eject }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { substituteInPlace pommed/cd_eject.c --replace /usr/bin/eject ${eject}/bin/eject ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pciutils libconfuse diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index ad5b664b09a..bbcf6e390f0 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, gettext, libnl, ncurses, pciutils, pkg-config, zlib }: stdenv.mkDerivation rec { pname = "powertop"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gettext libnl ncurses pciutils zlib ]; patches = lib.optional stdenv.hostPlatform.isMusl ( diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 4942710f755..9f12ab69539 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, ncurses, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, ncurses, pkg-config # `ps` with systemd support is able to properly report different # attributes like unit name, so we want to have it on linux. @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ] ++ lib.optional withSystemd systemd; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; makeFlags = [ "usrbin_execdir=$(out)/bin" ] ++ lib.optionals watchOnly [ "watch" "PKG_LDFLAGS="]; diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix index f6ee22ee0fc..ef7dbc55a9a 100644 --- a/pkgs/os-specific/linux/pscircle/default.nix +++ b/pkgs/os-specific/linux/pscircle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, meson, pkgconfig, ninja, cairo }: +{ lib, stdenv, fetchFromGitLab, meson, pkg-config, ninja, cairo }: stdenv.mkDerivation rec { pname = "pscircle"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ meson - pkgconfig + pkg-config cairo ninja ]; diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index 0d50c6b41d8..01b83f87911 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl , autoreconfHook , pciutils -, pkgconfig +, pkg-config , xorg }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0mjk9wr9rsb17yy92j6yi16hfpa6v5r1dbyiy60zp4r125wr63za"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ xorg.libpciaccess ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index f1655c94b84..e6aa07e6cd1 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, gettext, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, makeWrapper , ncurses, libdrm, libpciaccess, libxcb }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses libdrm libpciaccess libxcb ]; - nativeBuildInputs = [ pkgconfig gettext makeWrapper ]; + nativeBuildInputs = [ pkg-config gettext makeWrapper ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index fd7148b7eb6..b001ce966a9 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, docutils +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils , pandoc, ethtool, iproute, libnl, udev, python, perl , makeWrapper } : @@ -17,7 +17,7 @@ in stdenv.mkDerivation { sha256 = "04q4z95nxxxjc674qnbwn19bv18nl3x7xwp6aql17h1cw3gdmhw4"; }; - nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ]; buildInputs = [ libnl ethtool iproute udev python perl ]; cmakeFlags = [ diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 2c50c491d43..08356724c72 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }: +{ lib, stdenv, fetchFromGitHub, pkg-config, fuse, pcre }: stdenv.mkDerivation { pname = "rewritefs"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "15bcxprkxf0xqxljsqhb0jpi7p1vwqcb00sjs7nzrj7vh2p7mqla"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse pcre ]; prePatch = '' diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index d30c1bdf19b..1eba2511b98 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig, gettext +{ lib, stdenv, fetchurl, cmake, pkg-config, gettext , dbus, dbus-glib, libgaminggear, libgudev, lua , harfbuzz }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }' libroccat/roccat_helper.c ''; - nativeBuildInputs = [ cmake pkgconfig gettext ]; + nativeBuildInputs = [ cmake pkg-config gettext ]; buildInputs = [ dbus dbus-glib libgaminggear libgudev lua ]; cmakeFlags = [ diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index 8138fb9c346..fb41863c431 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, meson, ninja, pkgconfig, unixtools +, meson, ninja, pkg-config, unixtools , dbus, libcap, polkit, systemd }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ meson ninja pkgconfig unixtools.xxd ]; + nativeBuildInputs = [ meson ninja pkg-config unixtools.xxd ]; buildInputs = [ dbus libcap polkit systemd ]; mesonFlags = [ diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 4649ff8af56..2973b87210b 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, glibc, augeas, dnsutils, c-ares, curl, cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen, - python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap, + python, python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap, pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper, nss_wrapper, ncurses, Po4a, http-parser, jansson, @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss samba nfs-utils doxygen python python3 popt - talloc tdb tevent pkgconfig ldb pam openldap pcre kerberos + talloc tdb tevent pkg-config ldb pam openldap pcre kerberos cifs-utils glib keyutils dbus fakeroot libxslt libxml2 libuuid ldap systemd nspr check cmocka uid_wrapper nss_wrapper ncurses Po4a http-parser jansson ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 51ccdd22b11..421fc5986af 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -6,7 +6,7 @@ , ninja , meson , m4 -, pkgconfig +, pkg-config , coreutils , gperf , getent @@ -250,7 +250,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ - pkgconfig + pkg-config gperf ninja meson diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix index e6cdf69d6d1..e532f9965aa 100644 --- a/pkgs/os-specific/linux/thunderbolt/default.nix +++ b/pkgs/os-specific/linux/thunderbolt/default.nix @@ -2,7 +2,7 @@ , boost , cmake , fetchFromGitHub -, pkgconfig +, pkg-config , txt2tags }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "02w1bfm7xvq0dzkhwqiq0camkzz9kvciyhnsis61c8vzp39cwx0x"; }; - nativeBuildInputs = [ cmake pkgconfig txt2tags ]; + nativeBuildInputs = [ cmake pkg-config txt2tags ]; buildInputs = [ boost ]; cmakeFlags = [ diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index d304bd2533f..453df94f8fb 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }: +{ lib, stdenv, fetchurl, pkg-config, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }: stdenv.mkDerivation { name = "udisks-glue-1.3.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176"; }; - nativeBuildInputs = [ pkgconfig automake autoconf ]; + nativeBuildInputs = [ pkg-config automake autoconf ]; buildInputs = [ udisks1 dbus-glib glib libconfuse ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 8f48ae017f0..f20dc6b6076 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus-glib +{ lib, stdenv, fetchurl, pkg-config, sg3_utils, udev, glib, dbus, dbus-glib , polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm , libxslt, docbook_xsl, util-linux, libgudev }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { lvm2 libatasmart intltool libuuid libxslt docbook_xsl ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = [ "--localstatedir=/var" "--enable-lvm2" ]; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index b2b65de1078..7be729f4ac8 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, libtool, pkgconfig, gettext, gnused +{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, libtool, pkg-config, gettext, gnused , gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash, which , expat, libxslt, docbook_xsl, util-linux, mdadm, libgudev, libblockdev, parted , gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43, autoconf, automake @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - autoconf automake pkgconfig libtool gettext which gobject-introspection + autoconf automake pkg-config libtool gettext which gobject-introspection gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl ]; diff --git a/pkgs/os-specific/linux/unstick/default.nix b/pkgs/os-specific/linux/unstick/default.nix index cca6e6210cb..7d839f8acdb 100644 --- a/pkgs/os-specific/linux/unstick/default.nix +++ b/pkgs/os-specific/linux/unstick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, pkgconfig, libseccomp }: +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, libseccomp }: stdenv.mkDerivation rec { name = "unstick"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sourceRoot = "source/src"; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libseccomp ]; meta = { diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 9a01d3980e8..08bebefed13 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , libxslt , docbook_xsl , udev @@ -30,7 +30,7 @@ stdenv.mkDerivation { gettext gobject-introspection libxslt - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index a2f0b99e8d8..cff6df4ac1f 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , asciidoc -, pkgconfig +, pkg-config , libxslt , libxml2 , docbook_xml_dtd_45 @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook asciidoc - pkgconfig + pkg-config libxslt # xsltproc libxml2 # xmllint docbook_xml_dtd_45 diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index a723c18e842..9e298697d4b 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkgconfig, libusb1, hwdata , python3 }: +{ lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkg-config, libusb1, hwdata , python3 }: stdenv.mkDerivation rec { name = "usbutils-012"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libusb1 python3 ]; outputs = [ "out" "man" "python" ]; diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index c3c3c87dafc..d0c690a9527 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, dbus, libnotify, udisks2, gdk-pixbuf }: +{ lib, stdenv, fetchgit, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }: stdenv.mkDerivation { name = "usermount-0.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0gpp0vwiwr7kgbhh26jspv3255662mnvnav6g8i2h0qxar8hf8w2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus libnotify udisks2 gdk-pixbuf ]; NIX_CFLAGS_COMPILE = "-DENABLE_NOTIFICATIONS"; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 600d10888c5..d7629f0df04 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, zlib, shadow +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, zlib, shadow , ncurses ? null, perl ? null, pam, systemd ? null, minimal ? false }: stdenv.mkDerivation rec { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { "usrsbin_execdir=${placeholder "bin"}/sbin" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib pam ] ++ lib.filter (p: p != null) [ ncurses systemd perl ]; diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/os-specific/linux/uvcdynctrl/default.nix index 3d7fe1f5e15..d5f3a729978 100644 --- a/pkgs/os-specific/linux/uvcdynctrl/default.nix +++ b/pkgs/os-specific/linux/uvcdynctrl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libxml2 }: stdenv.mkDerivation { version = "0.3.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0s15xxgdx8lnka7vi8llbf6b0j4rhbjl6yp0qxaihysf890xj73s"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libxml2 ]; prePatch = '' diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index b9cbd48944c..81a5f74c42f 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, perl +{ stdenv, lib, fetchurl, pkg-config, perl , libjpeg, udev , withUtils ? true , withGUI ? true, alsaLib, libX11, qtbase, libGLU, wrapQtAppsHook @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h" ''; - nativeBuildInputs = [ pkgconfig perl ] ++ lib.optional withQt wrapQtAppsHook; + nativeBuildInputs = [ pkg-config perl ] ++ lib.optional withQt wrapQtAppsHook; buildInputs = [ udev ] ++ lib.optionals withQt [ alsaLib libX11 qtbase libGLU ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 49fd957de1a..32b61b02bee 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, pkgconfig, libnl +{ lib, stdenv, fetchurl, openssl, pkg-config, libnl , dbus, readline ? null, pcsclite ? null }: @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libnl dbus readline pcsclite ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; postInstall = '' mkdir -p $out/share/man/man5 $out/share/man/man8 diff --git a/pkgs/os-specific/linux/xf86-input-cmt/default.nix b/pkgs/os-specific/linux/xf86-input-cmt/default.nix index e3ac4df2fd7..a973f844fd4 100644 --- a/pkgs/os-specific/linux/xf86-input-cmt/default.nix +++ b/pkgs/os-specific/linux/xf86-input-cmt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, xorgserver, xorgproto, +{ lib, stdenv, fetchFromGitHub, pkg-config, xorgserver, xorgproto, utilmacros, libgestures, libevdevc }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./apply_patches.sh ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgserver xorgproto utilmacros libgestures libevdevc diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index bea1871b0eb..e404ac72f5c 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , xorgproto, libX11, libXext, libXi, libXrandr, libXrender -, ncurses, pkgconfig, xorgserver, udev, libXinerama, pixman }: +, ncurses, pkg-config, xorgserver, udev, libXinerama, pixman }: stdenv.mkDerivation rec { name = "xf86-input-wacom-0.36.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ xorgproto libX11 libXext libXi libXrandr libXrender - ncurses pkgconfig xorgserver udev libXinerama pixman ]; + ncurses pkg-config xorgserver udev libXinerama pixman ]; preConfigure = '' mkdir -p $out/share/X11/xorg.conf.d diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index dbd59d530ce..7c93fa91854 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, autoreconfHook, xorgproto, libX11, libXext -, pixman, pkgconfig, utilmacros, xorgserver +, pixman, pkg-config, utilmacros, xorgserver }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ autoreconfHook xorgproto libX11 libXext pixman - pkgconfig utilmacros xorgserver + pkg-config utilmacros xorgserver ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/os-specific/linux/xsensors/default.nix index 440a797a723..02ce560d8a9 100644 --- a/pkgs/os-specific/linux/xsensors/default.nix +++ b/pkgs/os-specific/linux/xsensors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gtk2, pkgconfig, lm_sensors }: +{ stdenv, lib, fetchurl, gtk2, pkg-config, lm_sensors }: stdenv.mkDerivation rec { pname = "xsensors"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "http://www.linuxhardware.org/xsensors/xsensors-${version}.tar.gz"; sha256 = "1siplsfgvcxamyqf44h71jx6jdfmvhfm7mh0y1q8ps4zs6pj2zwh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 lm_sensors ]; diff --git a/pkgs/os-specific/linux/zenmonitor/default.nix b/pkgs/os-specific/linux/zenmonitor/default.nix index 4fc2a11a65f..43cfd87cba5 100644 --- a/pkgs/os-specific/linux/zenmonitor/default.nix +++ b/pkgs/os-specific/linux/zenmonitor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "zenmonitor"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gtk3 ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 85990a6989d..61313f08f31 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -9,7 +9,7 @@ , nfs-utils , gawk, gnugrep, gnused, systemd , smartmontools, sysstat, sudo -, pkgconfig +, pkg-config # Kernel dependencies , kernel ? null @@ -91,7 +91,7 @@ let nativeBuildInputs = [ autoreconfHook269 nukeReferences ] ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ]) - ++ optional buildUser pkgconfig; + ++ optional buildUser pkg-config; buildInputs = optionals buildUser [ zlib libuuid attr libtirpc ] ++ optional buildUser openssl ++ optional (buildUser && enablePython) python3; diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index 283cceb1240..828b55fbba2 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, pkgconfig, libseccomp }: +{ lib, stdenv, fetchurl, pkg-config, libseccomp }: let version = "0.6.7"; in stdenv.mkDerivation { pname = "solo5"; inherit version; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optional (stdenv.hostPlatform.isLinux) libseccomp; src = fetchurl { diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index aec605111b5..2941561954d 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkgconfig +{ stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config , zlib, bzip2, lzma, libgcrypt }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "024wxaaxkf7p1i78bh5xrsqmfz7ss2amigbfl2r5w9h87zqn9aq3"; }; - nativeBuildInputs = [ autoconf automake libtool flex bison pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool flex bison pkg-config ]; buildInputs = let mkStatic = flip overrideDerivation (o: { diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index 3759a3d2f06..f2193d67ff5 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, systemd, util-linux, coreutils, wall, hostname, man +{ lib, stdenv, fetchurl, pkg-config, systemd, util-linux, coreutils, wall, hostname, man , enableCgiScripts ? true, gd }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ util-linux man ] ++ lib.optional enableCgiScripts gd; prePatch = '' diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 26d361e97c2..86017314ae7 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -2,7 +2,7 @@ jansson, libedit, libxml2, libxslt, ncurses, openssl, sqlite, util-linux, dmidecode, libuuid, newt, lua, speex, - srtp, wget, curl, iksemel, pkgconfig + srtp, wget, curl, iksemel, pkg-config }: let @@ -14,7 +14,7 @@ let dmidecode libuuid newt lua speex srtp wget curl iksemel ]; - nativeBuildInputs = [ util-linux pkgconfig ]; + nativeBuildInputs = [ util-linux pkg-config ]; patches = [ # We want the Makefile to install the default /var skeleton diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index b1997cf76f0..b29f9ca9e8e 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, libusb1, pkgconfig, pmutils, udev} : +{ lib, stdenv, fetchgit, libusb1, pkg-config, pmutils, udev} : let @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "0m2q01sbgf8z4559jpr6k3jivb8x98vxv1fhgx8nfcjbwz1q83gb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 pmutils udev ]; # shell thing didn't work so i replaced it using nix diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 433f08525dc..939237f513c 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand -, moreutils, jq, git, zip, rsync, pkgconfig, yarn, python2 +, moreutils, jq, git, zip, rsync, pkg-config, yarn, python2 , nodejs-12_x, libsecret, xorg, ripgrep, nettools }: let @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - nodejs yarn' python pkgconfig zip makeWrapper git rsync jq moreutils + nodejs yarn' python pkg-config zip makeWrapper git rsync jq moreutils ]; buildInputs = [ libsecret xorg.libX11 xorg.libxkbfile ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 2b4c250a966..5e2bf5a9755 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, curl +{ lib, stdenv, fetchFromGitHub, pkg-config, libtool, curl , python3, munge, perl, pam, zlib, shadow, coreutils , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , readline, freeipmi, xorg, lz4, rdma-core, nixosTests @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # this doesn't fix tests completely at least makes slurmd to launch hardeningDisable = [ "bindnow" ]; - nativeBuildInputs = [ pkgconfig libtool python3 ]; + nativeBuildInputs = [ pkg-config libtool python3 ]; buildInputs = [ curl python3 munge perl pam zlib libmysqlclient ncurses gtk2 lz4 rdma-core diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index 28651752dd1..ccb57f55bb2 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, util-linux +{ lib, stdenv, fetchFromGitHub, openssl, flex, bison, pkg-config, groff, libxml2, util-linux , coreutils, file, libtool, which, boost, autoreconfHook }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; strictDeps = true; - nativeBuildInputs = [ autoreconfHook pkgconfig flex bison libxml2 ]; + nativeBuildInputs = [ autoreconfHook pkg-config flex bison libxml2 ]; buildInputs = [ openssl groff libxml2 util-linux libtool which boost diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 08ded357488..5b4270a0a1c 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, nss, nspr, libqb , dbus, rdma-core, libstatgrab, net-snmp , enableDbus ? false , enableInfiniBandRdma ? false @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0pxs18vci9kq3qnqsg5i1h35jrxxiccwbm0mzja3g8j3izdsyvmb"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ nss nspr libqb diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index 4bb012d7297..a6a365c13da 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, systemd +{ lib, stdenv, fetchurl, pkg-config, systemd , boost, libsodium, libedit, re2 , net-snmp, lua, protobuf, openssl, zlib, h2o }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1wgv19b6y4fp5x1z54psaaialji2rckl5vdh156kyw47k9r5krya"; }; - nativeBuildInputs = [ pkgconfig protobuf ]; + nativeBuildInputs = [ pkg-config protobuf ]; buildInputs = [ systemd boost libsodium libedit re2 net-snmp lua openssl zlib h2o ]; configureFlags = [ diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 9c4b04cc6e6..07e8e7d5210 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring +{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2 , autoreconfHook }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ./runtime-deps.patch ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gnutls liburcu libidn2 libunistring nettle libedit diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 3277d694a4b..8954c9fcd89 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch # native deps. -, runCommand, pkgconfig, meson, ninja, makeWrapper +, runCommand, pkg-config, meson, ninja, makeWrapper # build+runtime deps. , knot-dns, luajitPackages, libuv, gnutls, lmdb , systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle @@ -50,7 +50,7 @@ unwrapped = stdenv.mkDerivation rec { patchShebangs scripts/ ''; - nativeBuildInputs = [ pkgconfig meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja ]; # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index d91a77ac372..972b92e7de9 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, boost, nixosTests +{ lib, stdenv, fetchurl, pkg-config, boost, nixosTests , openssl, systemd, lua, luajit, protobuf , enableProtoBuf ? false }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1kzmliim2pwh04y3y6bpai9fm0qmdicrmff09fv5h5wahi4pzfdh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost openssl systemd lua luajit diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 990386f06ce..cc7bb3317fd 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, nixosTests +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, nixosTests , boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd , mysql57, postgresql, lua, openldap, geoip, curl, unixODBC }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip libyamlcpp libsodium curl unixODBC openssl systemd diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index 54b699e8a6d..ee3f02d0425 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkgconfig }: +{ lib, stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "fcgiwrap"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; configureFlags = [ "--with-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ systemd fcgi ]; # systemd 230 no longer has libsystemd-daemon as a separate entity from libsystemd diff --git a/pkgs/servers/fileshare/default.nix b/pkgs/servers/fileshare/default.nix index e626019f09b..88c14a220d9 100644 --- a/pkgs/servers/fileshare/default.nix +++ b/pkgs/servers/fileshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, pkgconfig, git, libmicrohttpd_0_9_70 }: +{ stdenv, lib, fetchgit, pkg-config, git, libmicrohttpd_0_9_70 }: stdenv.mkDerivation rec { pname = "fileshare"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -i 's,$(shell git rev-parse --short HEAD),/${version},g' Makefile ''; - nativeBuildInputs = [ pkgconfig git ]; + nativeBuildInputs = [ pkg-config git ]; buildInputs = [ libmicrohttpd_0_9_70 ]; makeFlags = [ "BUILD=release" ]; diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix index 497cdb4fcf4..91b4e1d283e 100644 --- a/pkgs/servers/hitch/default.nix +++ b/pkgs/servers/hitch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, docutils, libev, openssl, pkgconfig, nixosTests }: +{ lib, stdenv, fetchurl, docutils, libev, openssl, pkg-config, nixosTests }: stdenv.mkDerivation rec { version = "1.7.0"; pname = "hitch"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1i75giwyr66ip8xsvk3gg5xdbxnmcabgxz8dqi06c58mw7qzhzn9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ docutils libev openssl ]; outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index 498d3bc0424..23a8d34a632 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, apacheHttpd, autoconf, automake, autoreconfHook, curl, fetchFromGitHub, glib, lasso, libtool, libxml2, libxslt, openssl, pkgconfig, xmlsec }: +{ lib, stdenv, apacheHttpd, autoconf, automake, autoreconfHook, curl, fetchFromGitHub, glib, lasso, libtool, libxml2, libxslt, openssl, pkg-config, xmlsec }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./fixdeps.patch ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ apacheHttpd autoconf automake curl glib lasso libtool libxml2 libxslt openssl xmlsec ]; configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs" "--exec-prefix=$out"]; diff --git a/pkgs/servers/http/apache-modules/mod_ca/default.nix b/pkgs/servers/http/apache-modules/mod_ca/default.nix index 04440666f29..3f2792f6498 100644 --- a/pkgs/servers/http/apache-modules/mod_ca/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ca/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, apacheHttpd, openssl, openldap, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_ca"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0gs66br3aig749rzifxn6j1rz2kps4hc4jppscly48lypgyygy8s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ apacheHttpd openssl openldap apr aprutil ]; # Note that configureFlags and installFlags are inherited by diff --git a/pkgs/servers/http/apache-modules/mod_crl/default.nix b/pkgs/servers/http/apache-modules/mod_crl/default.nix index a5f06a58ad5..a8025c153e0 100644 --- a/pkgs/servers/http/apache-modules/mod_crl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_crl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1x186kp6fr8nwg0jlv5phagxndvw4rjqfga9mkibmn6dx252p61d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_csr/default.nix b/pkgs/servers/http/apache-modules/mod_csr/default.nix index e83ef99a2f0..c334939a1c5 100644 --- a/pkgs/servers/http/apache-modules/mod_csr/default.nix +++ b/pkgs/servers/http/apache-modules/mod_csr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1p4jc0q40453wpvwqgnr1n007b4jxpkizzy3r4jygsxxgg4x9w7x"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index 783f7bfb4b2..da1b4e456b7 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, apacheHttpd, apr, avahi }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, apacheHttpd, apr, avahi }: stdenv.mkDerivation rec { name = "mod_dnssd-0.6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-lynx" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ apacheHttpd avahi apr ]; patches = [ (fetchpatch { diff --git a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix index fa9309fc472..116a9822291 100644 --- a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_ocsp"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0wy5363m4gq1w08iny2b3sh925bnznlln88pr9lgj9vgbn8pqnrn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix index 711443230e6..1632ed381b0 100644 --- a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix +++ b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_pkcs12"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1jfyax3qrw9rpf2n0pn6iw4dpn2nl4j0i2a998n5p1mdmjx9ch73"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_scep/default.nix b/pkgs/servers/http/apache-modules/mod_scep/default.nix index e56fa6987e1..68aeded93d0 100644 --- a/pkgs/servers/http/apache-modules/mod_scep/default.nix +++ b/pkgs/servers/http/apache-modules/mod_scep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_scep"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1imddqyi81l90valvndx9r0ywn32ggijrdfrjmbx8j1abaccagrc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_spkac/default.nix b/pkgs/servers/http/apache-modules/mod_spkac/default.nix index dba56765538..01ecae55b2e 100644 --- a/pkgs/servers/http/apache-modules/mod_spkac/default.nix +++ b/pkgs/servers/http/apache-modules/mod_spkac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_spkac"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0hpr58yazbi21m0sjn22a8ns4h81s4jlab9szcdw7j9w9jdc7j0h"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix index 5e315fe956f..d1d254c30b4 100644 --- a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix +++ b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_timestamp"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1p18mgxx2ainfrc2wm27rl3lh6yl0ihx6snib60jnp694587bfwg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index 1f5e861e60c..de3f58fc06f 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -7,7 +7,7 @@ , libevent , lzma , openssl -, pkgconfig +, pkg-config , systemd , tcp_wrappers , zlib @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "0h76n02nnpg7ir9247qrxb8p4d4p282nh13zrv5bb9sfm12pril2"; }; - nativeBuildInputs = [ cmake doxygen pkgconfig ]; + nativeBuildInputs = [ cmake doxygen pkg-config ]; buildInputs = [ bzip2 fuse libevent lzma openssl systemd tcp_wrappers zlib ]; meta = with lib; { diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 91b636cfdde..45023e800af 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5, curl, help2man -, sphinx, which, file, pkgconfig, getopt }: +, sphinx, which, file, pkg-config, getopt }: stdenv.mkDerivation rec { pname = "couchdb"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1b9cbdrmh1i71mrwvhm17v4cf7lckpil1vvq7lpmxyn6zfk0l84i"; }; - nativeBuildInputs = [ help2man which file pkgconfig sphinx ]; + nativeBuildInputs = [ help2man which file pkg-config sphinx ]; buildInputs = [ erlang icu openssl spidermonkey_1_8_5 curl ]; postInstall = '' diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index a53be3e2aa6..b533a908ef9 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig, cmake, ninja +, pkg-config, cmake, ninja , openssl, libuv, zlib }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "dev" "lib" ]; - nativeBuildInputs = [ pkgconfig cmake ninja ]; + nativeBuildInputs = [ pkg-config cmake ninja ]; buildInputs = [ openssl libuv zlib ]; meta = with lib; { diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 34da8750bef..d4a2c91d60b 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file +{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre, libxml2, zlib, bzip2, which, file , openssl, enableMagnet ? false, lua5_1 ? null , enableMysql ? false, libmysqlclient ? null , enableLdap ? false, openldap ? null @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ] ++ lib.optional enableMagnet lua5_1 ++ lib.optional enableMysql libmysqlclient diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix index b1764b55369..11b580ed8a0 100644 --- a/pkgs/servers/http/lwan/default.nix +++ b/pkgs/servers/http/lwan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, zlib, cmake, jemalloc }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, cmake, jemalloc }: stdenv.mkDerivation rec { pname = "lwan"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1znkcsbxw3r10prqvf2x27w1wmm9kd485pj59c364wlvqdhidwqr"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ jemalloc zlib ]; diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index 456c58e45a2..bbac8b843b1 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, file, qrencode, miniupnpc }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libevent, file, qrencode, miniupnpc }: stdenv.mkDerivation rec { pname = "pshs"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1j8j4r0vsmp6226q6jdgf9bzhx3qk7vdliwaw7f8kcsrkndkg6p4"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libevent file qrencode miniupnpc ]; # SSL requires libevent at 2.1 with ssl support diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix index 5f24c66ce64..d4e92bc3f6c 100644 --- a/pkgs/servers/http/redstore/default.nix +++ b/pkgs/servers/http/redstore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, redland, pkgconfig, gmp, zlib, librdf_raptor2 +{ lib, stdenv, fetchurl, redland, pkg-config, gmp, zlib, librdf_raptor2 , librdf_rasqal }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gmp redland zlib librdf_raptor2 librdf_rasqal ]; preConfigure = '' diff --git a/pkgs/servers/irc/atheme/default.nix b/pkgs/servers/irc/atheme/default.nix index 95019fb939f..a95a2ad27c3 100644 --- a/pkgs/servers/irc/atheme/default.nix +++ b/pkgs/servers/irc/atheme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, libmowgli, pkgconfig, git, gettext, pcre, libidn, cracklib, openssl }: +{ lib, stdenv, fetchgit, libmowgli, pkg-config, git, gettext, pcre, libidn, cracklib, openssl }: stdenv.mkDerivation rec { pname = "atheme"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { leaveDotGit = true; }; - nativeBuildInputs = [ pkgconfig git gettext ]; + nativeBuildInputs = [ pkg-config git gettext ]; buildInputs = [ libmowgli pcre libidn cracklib openssl ]; configureFlags = [ diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix index 8f6f31bba35..7bb0900d7d3 100644 --- a/pkgs/servers/irker/default.nix +++ b/pkgs/servers/irker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, python, pkgconfig +{ lib, stdenv, fetchFromGitLab, python, pkg-config , xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1hslwqa0gqsnl3l6hd5hxpn0wlachxd51infifhlwhyhd6iwgx8p"; }; - nativeBuildInputs = [ pkgconfig xmlto docbook2x docbook_xsl docbook_xml_dtd_412 ]; + nativeBuildInputs = [ pkg-config xmlto docbook2x docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ python diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index dd513d8a447..bfa372ed069 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, doxygen, perl, pam, nspr, nss, openldap +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, doxygen, perl, pam, nspr, nss, openldap , db, cyrus_sasl, svrcore, icu, net-snmp, kerberos, pcre, perlPackages, libevent, openssl, python }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "141iv1phgk1lw74sfjj3v7wy6qs0q56lvclwv2p0hqn1wg8ic4q6"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig doxygen ]; + nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; buildInputs = [ perl pam nspr nss openldap db cyrus_sasl svrcore icu net-snmp kerberos pcre libevent openssl python diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 046176fea2e..2c44094d0f7 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl +{ stdenv, lib, fetchurl, perl, pkg-config, systemd, openssl , bzip2, zlib, lz4, inotify-tools, pam, libcap , clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl , nixosTests @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "dovecot"; version = "2.3.13"; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer cyrus_sasl.dev ] ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ] diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index de3daf8e4c0..9d69b0d73c2 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,4 +1,4 @@ -{ coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, lib, stdenv +{ coreutils, db, fetchurl, openssl, pcre, perl, pkg-config, lib, stdenv , enableLDAP ? false, openldap , enableMySQL ? false, libmysqlclient, zlib , enableAuthDovecot ? false, dovecot @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1nsb2i5mqxfz1sl1bmbxmpb2qiaf3wffhfiw4j9vfpagy3xfhzpp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ coreutils db openssl perl pcre ] ++ lib.optional enableLDAP openldap ++ lib.optionals enableMySQL [ libmysqlclient zlib ] diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 39a3a645ce6..65ff08b4539 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, openssl, libevent, libasr, - python2, pkgconfig, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis, + python2, pkg-config, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis, enablePython ? true, enableLua ? true, enablePerl ? true, @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1b1mx71bvmv92lbm08wr2p60g3qhikvv3n15zsr6dcwbk9aqahzq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libevent libasr python2 lua5 perl libmysqlclient postgresql sqlite hiredis ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { "--with-scheduler-python" ] ++ lib.optionals enableLua [ - "--with-lua=${pkgconfig}" + "--with-lua=${pkg-config}" "--with-filter-lua" ] ++ lib.optionals enablePerl [ diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index d1bee8cc049..df04ade5b45 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, git, gperf, pcre, unbound, libev, tokyocabinet, pkgconfig, bash, libsrs2 }: +{ stdenv, lib, fetchFromGitHub, git, gperf, pcre, unbound, libev, tokyocabinet, pkg-config, bash, libsrs2 }: let version = "0.9"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { patches = [ ./0001-Fix-build-with-unbound-1.6.1.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [git gperf pcre unbound libev tokyocabinet bash libsrs2]; postUnpack = '' diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index ba69e99cc8b..0740613bad7 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, perl -, glib, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu +, glib, luajit, openssl, pcre, pkg-config, sqlite, ragel, icu , hyperscan, jemalloc, blas, lapack, lua, libsodium , withBlas ? true , withHyperscan ? stdenv.isx86_64 @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "0vwa7k2s2bkfb8w78z5izkd6ywjbzqysb0grls898y549hm8ii70"; }; - nativeBuildInputs = [ cmake pkgconfig perl ]; + nativeBuildInputs = [ cmake pkg-config perl ]; buildInputs = [ glib openssl pcre sqlite ragel icu jemalloc libsodium ] ++ lib.optional withHyperscan hyperscan ++ lib.optionals withBlas [ blas lapack ] diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index c310e17608e..d84aa954a00 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit , sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg_3, file -, pkgconfig, autoreconfHook }: +, pkg-config, autoreconfHook }: stdenv.mkDerivation rec { pname = "mediatomb"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg_3 file mp4v2 flac - pkgconfig autoreconfHook ]; + pkg-config autoreconfHook ]; meta = with lib; { homepage = "http://mediatomb.cc"; diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index 653ca399fcf..759ac94e568 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -1,5 +1,5 @@ { lib, buildGoPackage, fetchFromGitHub, fetchpatch -, pkgconfig, zlib, geoip }: +, pkg-config, zlib, geoip }: buildGoPackage rec { pname = "mirrorbits"; @@ -33,7 +33,7 @@ buildGoPackage rec { deleteVendor = true; goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib geoip ]; meta = { diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index f7c97abf104..6a63292301b 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -4,7 +4,7 @@ , srt , ffmpeg_3_4 , bc -, pkgconfig +, pkg-config , perl , openssl , zlib @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { makeFlags = "release CONFIG_LIBRARY_PATHS= CONFIG_PKG_PATHS= GLOBAL_CC=$(CC) GLOBAL_CXX=$(CXX) GLOBAL_LD=$(CXX) SHELL=${stdenv.shell}"; enableParallelBuilding = true; - nativeBuildInputs = [ bc pkgconfig perl ]; + nativeBuildInputs = [ bc pkg-config perl ]; buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 ]; preBuild = '' diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index 80f3d2c14ab..551fa028811 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkg-config , doxygen, freetype, libX11, libftdi, libusb-compat-0_1, libusb1, ncurses, perl }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ freetype libX11 libftdi libusb-compat-0_1 libusb1 ncurses ]; - nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkg-config ]; # In 0.5.9: gcc: error: libbignum.a: No such file or directory enableParallelBuilding = false; diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index ef4a3cb4d38..e4516f652b9 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libiconv, openssl, pcre }: +{ lib, stdenv, fetchurl, pkg-config, libiconv, openssl, pcre }: import ./versions.nix ({ version, sha256 }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ import ./versions.nix ({ version, sha256 }: inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libiconv openssl diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 18c1ac52fc1..067d8883324 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libevent, libiconv, openssl, pcre, zlib +{ lib, stdenv, fetchurl, pkg-config, libevent, libiconv, openssl, pcre, zlib , odbcSupport ? true, unixODBC , snmpSupport ? true, net-snmp , sshSupport ? true, libssh2 @@ -25,7 +25,7 @@ in inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libevent libiconv diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 2e6275921a4..03e9c1a867b 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, curl, libevent, libiconv, libxml2, openssl, pcre, zlib +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, curl, libevent, libiconv, libxml2, openssl, pcre, zlib , jabberSupport ? true, iksemel , ldapSupport ? true, openldap , odbcSupport ? true, unixODBC @@ -25,7 +25,7 @@ in inherit sha256; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ curl libevent diff --git a/pkgs/servers/mumsi/default.nix b/pkgs/servers/mumsi/default.nix index 3cc3f338f2f..b4d1fda4090 100644 --- a/pkgs/servers/mumsi/default.nix +++ b/pkgs/servers/mumsi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, boost +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, boost , log4cpp, pjsip, openssl, alsaLib, mumlib }: with lib; stdenv.mkDerivation { pname = "mumsi"; @@ -11,8 +11,8 @@ with lib; stdenv.mkDerivation { sha256 = "0vrivl1fiiwjsz4v26nrn8ra3k9v0mcz7zjm2z319fw8hv6n1nrk"; }; - buildInputs = [ boost log4cpp pkgconfig pjsip mumlib openssl alsaLib ]; - nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ boost log4cpp pkg-config pjsip mumlib openssl alsaLib ]; + nativeBuildInputs = [ cmake pkg-config ]; installPhase = '' install -Dm555 mumsi $out/bin/mumsi ''; diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index ad3a68b46eb..a638c063852 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, systemd, glib, dbus, libnl, pythonPackages }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, pythonPackages }: stdenv.mkDerivation rec { name = "neard-0.16"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ]; pythonPath = [ pythonPackages.pygobject2 pythonPackages.dbus-python pythonPackages.pygtk ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 3118a0128df..799c26e82fd 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests +{ lib, stdenv, fetchurl, lua, pkg-config, systemd, jemalloc, nixosTests , tlsSupport ? true, openssl }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''} ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lua ] ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 49b998ecbf0..b76210dd905 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}: +{lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}: stdenv.mkDerivation rec { pname = "osrm-backend"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=pessimizing-move" "-Wno-error=redundant-move" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ]; postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles"; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 625e2e0e8ca..32aa421ebf0 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook , libsndfile, libtool, makeWrapper, perlPackages , xorg, libcap, alsaLib, glib, dconf , avahi, libjack2, libasyncns, lirc, dbus @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper perlPackages.perl perlPackages.XMLParser ]; + nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper perlPackages.perl perlPackages.XMLParser ]; propagatedBuildInputs = lib.optionals stdenv.isLinux [ libcap ]; diff --git a/pkgs/servers/pulseaudio/pali.nix b/pkgs/servers/pulseaudio/pali.nix index d5ae80b5e79..cc11f98a829 100644 --- a/pkgs/servers/pulseaudio/pali.nix +++ b/pkgs/servers/pulseaudio/pali.nix @@ -4,7 +4,7 @@ , fetchFromGitLab , meson , ninja -, pkgconfig +, pkg-config , libsndfile , libtool , makeWrapper @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { makeWrapper meson ninja - pkgconfig + pkg-config perlPackages.perl perlPackages.XMLParser ]; diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index 1d44561806a..c3c69fa79b6 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libcap, libnl, readline, net-snmp, less, perl, texinfo, - pkgconfig, c-ares }: + pkg-config, c-ares }: stdenv.mkDerivation rec { pname = "quagga"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { [ readline net-snmp c-ares ] ++ lib.optionals stdenv.isLinux [ libcap libnl ]; - nativeBuildInputs = [ pkgconfig perl texinfo ]; + nativeBuildInputs = [ pkg-config perl texinfo ]; configureFlags = [ "--sysconfdir=/etc/quagga" diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 9755d42ce01..ec3ed346cad 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, lib, stdenv, pkgconfig, libnsl, libtirpc, autoreconfHook +{ fetchgit, lib, stdenv, pkg-config, libnsl, libtirpc, autoreconfHook , useSystemd ? true, systemd }: stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { "--with-rpcuser=rpc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { description = "ONC RPC portmapper"; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 0df084230b6..c125732cafc 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , python -, pkgconfig +, pkg-config , bison , flex , perl @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config bison flex perl diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix index d48df47f0c5..b0793d5e42a 100644 --- a/pkgs/servers/scylladb/default.nix +++ b/pkgs/servers/scylladb/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchgit, python3Packages, - pkgconfig, + pkg-config, gcc8Stdenv, boost, git, @@ -44,7 +44,7 @@ gcc8Stdenv.mkDerivation { patches = [ ./seastar-configure-script-paths.patch ./configure-etc-osrelease.patch ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake makeWrapper ninja diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index d05c2e527e2..b3a14f5f2c7 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mecab, kytea, libedit, pkgconfig +{ lib, stdenv, fetchurl, mecab, kytea, libedit, pkg-config , suggestSupport ? false, zeromq, libevent, msgpack , lz4Support ? false, lz4 , zlibSupport ? false, zlib @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = with lib; - [ pkgconfig mecab kytea libedit ] + [ pkg-config mecab kytea libedit ] ++ optional lz4Support lz4 ++ optional zlibSupport zlib ++ optionals suggestSupport [ zeromq libevent msgpack ]; diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix index 3eea64e6ab2..90db957d3c0 100644 --- a/pkgs/servers/shairplay/default.nix +++ b/pkgs/servers/shairplay/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , avahi, libao }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "02xkd9al79pbqh8rhzz5w99vv43jg5vqkqg7kxsw8c8sz9di9wsa"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ avahi libao ]; diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 108721fceb0..bae2f3aad79 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsaLib -, libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: +, libdaemon, popt, pkg-config, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { version = "3.3.7"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "mikebrady"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 94a32a6e78b..c81c7f30b31 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libgcrypt, libgpgerror, libtasn1 # Optional Dependencies @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Fixes support for gcrypt 1.6+ patches = [ ./gcrypt-fix.patch ./freebsd-unistd.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgcrypt libgpgerror libtasn1 optPam optLibidn optGnutls ]; configureFlags = [ diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index e89a599ebec..d7611baad14 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchpatch, stdenv, lib, pkgconfig, autoreconfHook +{ fetchFromGitHub, fetchpatch, stdenv, lib, pkg-config, autoreconfHook , ncurses, gnutls, readline , openssl, perl, sqlite, libjpeg, speex, pcre, libuuid , ldns, libedit, yasm, which, libsndfile, libtiff @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl ncurses gnutls readline perl libjpeg sqlite pcre speex ldns libedit yasm which diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index f8995063a0c..3e69602170f 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }: +{ fetchurl, lib, stdenv, pkg-config, ucommon, libosip, libexosip, gnutls, zlib }: stdenv.mkDerivation rec { name = "sipwitch-1.9.15"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "2a7aa86a653f6810b3cd9cce6c37b3f70e937e7d14b09fd5c2a70d70588a9482"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ucommon libosip libexosip gnutls zlib ]; preConfigure = '' diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index 3a332876ffd..0ef8a5799e2 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libcap }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libcap }: stdenv.mkDerivation rec { pname = "smcroute"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mjq9cx093b0825rqbcq3z0lzy81pd8h0fz6rda6npg3604rxj81"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libcap ]; configureFlags = [ diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 90fdbd09b6e..e70d43a1505 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config, makeWrapper, ncurses, nixosTests , libiconv, openssl, pcre2, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libaio, libevent, jemalloc, cracklib, systemd, perl , bzip2, lz4, lzo, snappy, xz, zlib, zstd @@ -33,7 +33,7 @@ common = rec { # attributes common to both builds name = "mariadb-${version}.tar.gz"; }; - nativeBuildInputs = [ cmake pkgconfig ] + nativeBuildInputs = [ cmake pkg-config ] ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index cc9852d57e3..98166d0b38a 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, bison, pkgconfig +{ lib, stdenv, fetchurl, cmake, bison, pkg-config , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl , cctools, CoreServices, developer_cmds , libtirpc, rpcsvc-proto @@ -21,7 +21,7 @@ self = stdenv.mkDerivation rec { export PATH=$PATH:$TMPDIR ''; - nativeBuildInputs = [ cmake bison pkgconfig rpcsvc-proto ]; + nativeBuildInputs = [ cmake bison pkg-config rpcsvc-proto ]; buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib libtirpc ] ++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]; diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 519ef64bca8..3dbd84c2a98 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bison, cmake, pkgconfig +{ lib, stdenv, fetchurl, bison, cmake, pkg-config , boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd , numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto }: @@ -17,7 +17,7 @@ self = stdenv.mkDerivation rec { ./abi-check.patch ]; - nativeBuildInputs = [ bison cmake pkgconfig rpcsvc-proto ]; + nativeBuildInputs = [ bison cmake pkg-config rpcsvc-proto ]; ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. postPatch = '' diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 20e3637f40c..27345616f89 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -4,7 +4,7 @@ let # dependencies { stdenv, lib, fetchurl, makeWrapper , glibc, zlib, readline, openssl, icu, systemd, libossp_uuid - , pkgconfig, libxml2, tzdata + , pkg-config, libxml2, tzdata # This is important to obtain a version of `libpq` that does not depend on systemd. , enableSystemd ? (lib.versionAtLeast version "9.6" && !stdenv.isDarwin) @@ -40,7 +40,7 @@ let ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; - nativeBuildInputs = lib.optionals icuEnabled [ pkgconfig ]; + nativeBuildInputs = lib.optionals icuEnabled [ pkg-config ]; enableParallelBuilding = !stdenv.isDarwin; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 50fb383dabb..be284387174 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, postgresql, msgpack, groonga }: +{ lib, stdenv, fetchurl, pkg-config, postgresql, msgpack, groonga }: stdenv.mkDerivation rec { pname = "pgroonga"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rd3cxap9rqpg5y8y48r5bd7rki3lck6qsrb0bqdqm9xffnibw8j"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ postgresql msgpack groonga ]; makeFlags = [ "HAVE_MSGPACK=1" ]; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 4cc7423ab2c..590aa6f2b6b 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -7,7 +7,7 @@ , proj , gdal , json_c -, pkgconfig +, pkg-config , file , protobufc , libiconv @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] ++ lib.optional stdenv.isDarwin libiconv; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; dontDisableStatic = true; # postgis config directory assumes /include /lib from the same root for json-c library diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index f94bb69871c..3f3b2aa4f14 100644 --- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, postgresql }: +{ lib, stdenv, fetchFromGitHub, pkg-config, postgresql }: stdenv.mkDerivation { pname = "tsearch-extras"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "18j0saqblg3jhrz38splk173xjwdf32c67ymm18m8n5y94h8d2ba"; }; - nativenativeBuildInputs = [ pkgconfig ]; + nativenativeBuildInputs = [ pkg-config ]; buildInputs = [ postgresql ]; installPhase = '' diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 238a298f85f..59da5a80a37 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap -, expat, libxml2, openssl, pkgconfig +, expat, libxml2, openssl, pkg-config }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1q1ywpic6s7dfjj3cwzcfgscc4zq0aih462gyas7j1z683ss14b8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl openldap db cyrus_sasl expat libxml2 openssl ] ++ lib.optionals stdenv.isLinux [ libcap pam ]; diff --git a/pkgs/servers/tang/default.nix b/pkgs/servers/tang/default.nix index caeb969f23b..8c5a64f2295 100644 --- a/pkgs/servers/tang/default.nix +++ b/pkgs/servers/tang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, asciidoc +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, asciidoc , jansson, jose, http-parser, systemd }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc ]; + nativeBuildInputs = [ autoreconfHook pkg-config asciidoc ]; buildInputs = [ jansson jose http-parser systemd ]; outputs = [ "out" "man" ]; diff --git a/pkgs/servers/tmate-ssh-server/default.nix b/pkgs/servers/tmate-ssh-server/default.nix index 6fe5bc201f9..ea564e6791d 100644 --- a/pkgs/servers/tmate-ssh-server/default.nix +++ b/pkgs/servers/tmate-ssh-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkg-config , zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ]; - nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; + nativeBuildInputs = [ autoreconfHook cmake pkg-config ]; meta = with lib; { homepage = "https://tmate.io/"; diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index bd055e65687..3ef571bc82a 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig, cmake, xxd +, pkg-config, cmake, xxd , openssl, libwebsockets, json_c, libuv, zlib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1ifgw93g8jaaa6fgfqjnn83n5ccr6l72ynwwwa97hfwjk90r14fg"; }; - nativeBuildInputs = [ pkgconfig cmake xxd ]; + nativeBuildInputs = [ pkg-config cmake xxd ]; buildInputs = [ openssl libwebsockets json_c libuv zlib ]; outputs = [ "out" "man" ]; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 716e8e1c1aa..98a40766d7e 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config , avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_3, libiconv, openssl, python , v4l-utils, which, zlib }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation { which zlib ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=stringop-truncation" ]; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 14876e47df3..bd74a628877 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nixosTests, lib, fetchurl, pkgconfig, jansson, pcre +{ stdenv, nixosTests, lib, fetchurl, pkg-config, jansson, pcre # plugins: list of strings, eg. [ "python2" "python3" ] , plugins ? [] , pam, withPAM ? stdenv.isLinux @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ./additional-php-ldflags.patch ]; - nativeBuildInputs = [ python3 pkgconfig ]; + nativeBuildInputs = [ python3 pkg-config ]; buildInputs = [ jansson pcre ] ++ lib.optional withPAM pam diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 433cc44415c..db426f399f8 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit +{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkg-config, readline, libedit , python3, makeWrapper }: let @@ -14,7 +14,7 @@ let passthru.python = python3; - nativeBuildInputs = with python3.pkgs; [ pkgconfig docutils sphinx ]; + nativeBuildInputs = with python3.pkgs; [ pkg-config docutils sphinx ]; buildInputs = [ pcre libxslt groff ncurses readline libedit makeWrapper python3 ]; diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index b6ec11e4e8d..55d13ffae31 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, libmhash, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils }: stdenv.mkDerivation rec { version = "1.0.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig docutils ]; + nativeBuildInputs = [ autoreconfHook pkg-config docutils ]; buildInputs = [ varnish libmhash ]; postPatch = '' diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index a9900424b96..20f8aa91ab6 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, docutils }: stdenv.mkDerivation rec { version = "0.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; - nativeBuildInputs = [ pkgconfig docutils autoreconfHook varnish.python ]; + nativeBuildInputs = [ pkg-config docutils autoreconfHook varnish.python ]; buildInputs = [ varnish ]; postPatch = '' substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal" diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index f39afd9c87c..0a8e97df61e 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils, removeReferencesTo }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, docutils, removeReferencesTo }: stdenv.mkDerivation rec { version = "0.15.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook docutils - pkgconfig + pkg-config removeReferencesTo varnish.python # use same python version as varnish server ]; diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/servers/web-apps/fileshelter/default.nix index 76b468d35d7..b6abc423eb8 100644 --- a/pkgs/servers/web-apps/fileshelter/default.nix +++ b/pkgs/servers/web-apps/fileshelter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libzip, boost, wt4, libconfig, pkgconfig } : +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libzip, boost, wt4, libconfig, pkg-config } : stdenv.mkDerivation rec { pname = "fileshelter"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libzip boost wt4 libconfig ]; NIX_LDFLAGS = "-lpthread"; diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index aa2a9fc9258..b3fedf9bc5d 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -1,5 +1,5 @@ { gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python2, lndir -, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkgconfig }: +, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config }: with lib; gnustep.stdenv.mkDerivation rec { pname = "SOGo"; version = "5.0.1"; @@ -12,7 +12,7 @@ with lib; gnustep.stdenv.mkDerivation rec { }; nativeBuildInputs = [ gnustep.make makeWrapper python2 ]; - buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkgconfig ] + buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkg-config ] ++ optional (openldap != null) openldap; patches = [ diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix index 69270afb76b..05741e0ac21 100644 --- a/pkgs/servers/web-apps/virtlyst/default.nix +++ b/pkgs/servers/web-apps/virtlyst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, autoPatchelfHook +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, autoPatchelfHook , qtbase, libvirt, cutelyst, grantlee }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1vgjai34hqppkpl0ryxkyhpm9dsx1chs3bii3wc3h40hl80n6dgy"; }; - nativeBuildInputs = [ cmake pkgconfig autoPatchelfHook ]; + nativeBuildInputs = [ cmake pkg-config autoPatchelfHook ]; buildInputs = [ qtbase libvirt cutelyst grantlee ]; installPhase = '' diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 0d7d6df87bc..9beb0553395 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, xorg, pixman, pkgconfig, AppKit, Foundation, Xplugin }: +{ lib, stdenv, fetchurl, xorg, pixman, pkg-config, AppKit, Foundation, Xplugin }: let version = "1.3.1"; in stdenv.mkDerivation { @@ -19,7 +19,7 @@ in stdenv.mkDerivation { xorg.libXrandr xorg.libXext pixman - pkgconfig + pkg-config AppKit Xplugin Foundation ]; meta = with lib; { diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 88bdaeb67ae..065216da3cc 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -5,7 +5,7 @@ lib.makeScope newScope (self: with self; { inherit pixman; - appres = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXt }: stdenv.mkDerivation { + appres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXt }: stdenv.mkDerivation { name = "appres-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -13,12 +13,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0a2r4sxky3k7b3kdb5pbv709q9b5zi3gxjz336wl66f828vqkbgz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - bdftopcf = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + bdftopcf = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "bdftopcf-1.1"; builder = ./builder.sh; src = fetchurl { @@ -26,12 +26,12 @@ lib.makeScope newScope (self: with self; { sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - bitmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + bitmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "bitmap-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -39,12 +39,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw xbitmaps libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - editres = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + editres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "editres-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -52,12 +52,12 @@ lib.makeScope newScope (self: with self; { sha256 = "04awfwmy3f9f0bchidc4ssbgrbicn5gzasg3jydpfnp5513d76h8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - encodings = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + encodings = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "encodings-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -65,12 +65,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0caafx0yqqnqyvbalxhh3mb0r9v36xmcy5zjhygb2i508dhy35mx"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobe100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -78,13 +78,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontadobe75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobe75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -92,13 +92,13 @@ lib.makeScope newScope (self: with self; { sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontadobeutopia100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobeutopia100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-100dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -106,13 +106,13 @@ lib.makeScope newScope (self: with self; { sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontadobeutopia75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobeutopia75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-75dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -120,13 +120,13 @@ lib.makeScope newScope (self: with self; { sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontadobeutopiatype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontadobeutopiatype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -134,13 +134,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontalias = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + fontalias = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "font-alias-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -148,12 +148,12 @@ lib.makeScope newScope (self: with self; { sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - fontarabicmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontarabicmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-arabic-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -161,13 +161,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbh100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbh100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -175,13 +175,13 @@ lib.makeScope newScope (self: with self; { sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbh75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbh75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -189,13 +189,13 @@ lib.makeScope newScope (self: with self; { sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-lucidatypewriter-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -203,13 +203,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-lucidatypewriter-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -217,13 +217,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbhttf = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontbhttf = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-bh-ttf-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -231,13 +231,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbhtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontbhtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-bh-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -245,13 +245,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbitstream100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontbitstream100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -259,13 +259,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbitstream75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontbitstream75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -273,13 +273,13 @@ lib.makeScope newScope (self: with self; { sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbitstreamtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontbitstreamtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -287,13 +287,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontcronyxcyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontcronyxcyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-cronyx-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -301,13 +301,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontcursormisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontcursormisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-cursor-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -315,13 +315,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontdaewoomisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontdaewoomisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-daewoo-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -329,13 +329,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontdecmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontdecmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-dec-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -343,13 +343,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontibmtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontibmtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-ibm-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -357,13 +357,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontisasmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontisasmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-isas-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -371,13 +371,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontjismisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontjismisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-jis-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -385,13 +385,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmicromisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontmicromisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-micro-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -399,13 +399,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmisccyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontmisccyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-misc-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -413,13 +413,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmiscethiopic = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontmiscethiopic = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-misc-ethiopic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -427,13 +427,13 @@ lib.makeScope newScope (self: with self; { sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmiscmeltho = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontmiscmeltho = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-misc-meltho-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -441,13 +441,13 @@ lib.makeScope newScope (self: with self; { sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmiscmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontmiscmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-misc-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -455,13 +455,13 @@ lib.makeScope newScope (self: with self; { sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmuttmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontmuttmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-mutt-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -469,13 +469,13 @@ lib.makeScope newScope (self: with self; { sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontschumachermisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontschumachermisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-schumacher-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -483,13 +483,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontscreencyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontscreencyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-screen-cyrillic-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -497,13 +497,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontsonymisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontsonymisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-sony-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -511,13 +511,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontsunmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-sun-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -525,13 +525,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fonttosfnt = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation { + fonttosfnt = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation { name = "fonttosfnt-1.2.1"; builder = ./builder.sh; src = fetchurl { @@ -539,12 +539,12 @@ lib.makeScope newScope (self: with self; { sha256 = "16r51h5wfy85wnbq3q8v8a184hb25c3ksjgix0mlcywdz7qkbj07"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc freetype xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - fontutil = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + fontutil = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "font-util-1.3.1"; builder = ./builder.sh; src = fetchurl { @@ -552,12 +552,12 @@ lib.makeScope newScope (self: with self; { sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - fontwinitzkicyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontwinitzkicyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-winitzki-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -565,13 +565,13 @@ lib.makeScope newScope (self: with self; { sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontxfree86type1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontxfree86type1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-xfree86-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -579,13 +579,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - gccmakedep = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + gccmakedep = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "gccmakedep-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -593,12 +593,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - iceauth = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xorgproto }: stdenv.mkDerivation { + iceauth = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto }: stdenv.mkDerivation { name = "iceauth-1.0.8"; builder = ./builder.sh; src = fetchurl { @@ -606,12 +606,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1ik0mdidmyvy48hn8p2hwvf3535rf3m96hhf0mvcqrbj44x23vp6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - ico = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + ico = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "ico-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -619,12 +619,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0gvpwfk9kvlfn631dgizc45qc2qqjn9pavdp2q7qb3drkvr64fyp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - imake = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + imake = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "imake-1.0.8"; builder = ./builder.sh; src = fetchurl { @@ -632,12 +632,12 @@ lib.makeScope newScope (self: with self; { sha256 = "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libAppleWM = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libAppleWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libAppleWM-1.4.1"; builder = ./builder.sh; src = fetchurl { @@ -645,12 +645,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libFS = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { + libFS = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { name = "libFS-1.0.8"; builder = ./builder.sh; src = fetchurl { @@ -658,12 +658,12 @@ lib.makeScope newScope (self: with self; { sha256 = "03xxyvpfa3rhqcld4p2chkil482jn9cp80hj17jdybcv2hkkgqf8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xtrans ]; meta.platforms = lib.platforms.unix; }) {}; - libICE = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { + libICE = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { name = "libICE-1.0.10"; builder = ./builder.sh; src = fetchurl { @@ -671,12 +671,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0j638yvmyna2k4mz465jywgdybgdchdqppfx6xfazg7l5khxr1kg"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xtrans ]; meta.platforms = lib.platforms.unix; }) {}; - libSM = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libuuid, xorgproto, xtrans }: stdenv.mkDerivation { + libSM = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libuuid, xorgproto, xtrans }: stdenv.mkDerivation { name = "libSM-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -684,12 +684,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1fwwfq9v3sqmpzpscymswxn76xhxnysa24pfim1mcpxhvjcl89id"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libuuid xorgproto xtrans ]; meta.platforms = lib.platforms.unix; }) {}; - libWindowsWM = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libWindowsWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libWindowsWM-1.0.1"; builder = ./builder.sh; src = fetchurl { @@ -697,12 +697,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { + libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { name = "libX11-1.7.0"; builder = ./builder.sh; src = fetchurl { @@ -710,12 +710,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0m6bfwllr3pq2c00l51y62yiq15kphc8dw69zf67qhwmclxzkj1n"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libxcb xtrans ]; meta.platforms = lib.platforms.unix; }) {}; - libXScrnSaver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libXScrnSaver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libXScrnSaver-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -723,12 +723,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1y4vx1vabg7j9hamp0vrfrax5b0lmgm3h0lbgbb3hnkv3dd0f5zr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libXTrap = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXt }: stdenv.mkDerivation { + libXTrap = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXt }: stdenv.mkDerivation { name = "libXTrap-1.0.1"; builder = ./builder.sh; src = fetchurl { @@ -736,12 +736,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0bi5wxj6avim61yidh9fd3j4n8czxias5m8vss9vhxjnk1aksdwg"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXt ]; meta.platforms = lib.platforms.unix; }) {}; - libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + libXau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "libXau-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -749,12 +749,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXaw = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXmu, libXpm, libXt }: stdenv.mkDerivation { + libXaw = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXmu, libXpm, libXt }: stdenv.mkDerivation { name = "libXaw-1.0.13"; builder = ./builder.sh; src = fetchurl { @@ -762,12 +762,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto libXmu libXpm libXt ]; meta.platforms = lib.platforms.unix; }) {}; - libXaw3d = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, libXpm, xorgproto, libXt }: stdenv.mkDerivation { + libXaw3d = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, libXpm, xorgproto, libXt }: stdenv.mkDerivation { name = "libXaw3d-1.6.3"; builder = ./builder.sh; src = fetchurl { @@ -775,12 +775,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXmu libXpm xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - libXcomposite = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { + libXcomposite = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { name = "libXcomposite-0.4.5"; builder = ./builder.sh; src = fetchurl { @@ -788,12 +788,12 @@ lib.makeScope newScope (self: with self; { sha256 = "13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXfixes ]; meta.platforms = lib.platforms.unix; }) {}; - libXcursor = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation { + libXcursor = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation { name = "libXcursor-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -801,12 +801,12 @@ lib.makeScope newScope (self: with self; { sha256 = "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXfixes libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - libXdamage = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { + libXdamage = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { name = "libXdamage-1.1.5"; builder = ./builder.sh; src = fetchurl { @@ -814,12 +814,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0igaw2akjf712y3rv7lx473jigxmcv9rs9y8sbrvbhya8f30cd5p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXfixes ]; meta.platforms = lib.platforms.unix; }) {}; - libXdmcp = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + libXdmcp = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "libXdmcp-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -827,12 +827,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXext = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + libXext = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "libXext-1.3.4"; builder = ./builder.sh; src = fetchurl { @@ -840,12 +840,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXfixes = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + libXfixes = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "libXfixes-5.0.3"; builder = ./builder.sh; src = fetchurl { @@ -853,12 +853,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - libXfont = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { + libXfont = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { name = "libXfont-1.5.4"; builder = ./builder.sh; src = fetchurl { @@ -866,12 +866,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; meta.platforms = lib.platforms.unix; }) {}; - libXfont2 = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { + libXfont2 = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { name = "libXfont2-2.0.4"; builder = ./builder.sh; src = fetchurl { @@ -879,12 +879,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1rk9pjxcm01lbr1dxhnvk4f2qrn6zp068qjbvvz5w0z5d0rin5bd"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; meta.platforms = lib.platforms.unix; }) {}; - libXft = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { + libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { name = "libXft-2.3.3"; builder = ./builder.sh; src = fetchurl { @@ -892,12 +892,12 @@ lib.makeScope newScope (self: with self; { sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fontconfig freetype libX11 xorgproto libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - libXi = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXfixes }: stdenv.mkDerivation { + libXi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXfixes }: stdenv.mkDerivation { name = "libXi-1.7.10"; builder = ./builder.sh; src = fetchurl { @@ -905,12 +905,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0q8hz3slga3w3ch8wp0k7ay9ilhz315qnab0w1y2x9w3cf7hv8rn"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXfixes ]; meta.platforms = lib.platforms.unix; }) {}; - libXinerama = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + libXinerama = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { name = "libXinerama-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -918,12 +918,12 @@ lib.makeScope newScope (self: with self; { sha256 = "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXmu = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { + libXmu = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { name = "libXmu-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -931,12 +931,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - libXp = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXau, libXext }: stdenv.mkDerivation { + libXp = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXau, libXext }: stdenv.mkDerivation { name = "libXp-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -944,12 +944,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXau libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { + libXpm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { name = "libXpm-3.5.13"; builder = ./builder.sh; src = fetchurl { @@ -957,12 +957,12 @@ lib.makeScope newScope (self: with self; { sha256 = "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ libX11 libXext xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - libXpresent = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + libXpresent = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "libXpresent-1.0.0"; builder = ./builder.sh; src = fetchurl { @@ -970,12 +970,12 @@ lib.makeScope newScope (self: with self; { sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - libXrandr = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation { + libXrandr = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation { name = "libXrandr-1.5.2"; builder = ./builder.sh; src = fetchurl { @@ -983,12 +983,12 @@ lib.makeScope newScope (self: with self; { sha256 = "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - libXrender = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + libXrender = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "libXrender-0.9.10"; builder = ./builder.sh; src = fetchurl { @@ -996,12 +996,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - libXres = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libXres = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libXres-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -1009,12 +1009,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1m0jr0lbz9ixpp9ihk68349q0i7ry2379lnfzdy4mrl86ijc2xgz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libXt = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation { + libXt = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation { name = "libXt-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -1022,12 +1022,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0cbqlyssr8aia88c8i7z59z9d0kp3p2hp6683xhz9ndyv8qza7dk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE xorgproto libSM libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - libXtst = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXi }: stdenv.mkDerivation { + libXtst = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi }: stdenv.mkDerivation { name = "libXtst-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -1035,12 +1035,12 @@ lib.makeScope newScope (self: with self; { sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXi ]; meta.platforms = lib.platforms.unix; }) {}; - libXv = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libXv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libXv-1.0.11"; builder = ./builder.sh; src = fetchurl { @@ -1048,12 +1048,12 @@ lib.makeScope newScope (self: with self; { sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { + libXvMC = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { name = "libXvMC-1.0.12"; builder = ./builder.sh; src = fetchurl { @@ -1061,12 +1061,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXv ]; meta.platforms = lib.platforms.unix; }) {}; - libXxf86dga = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + libXxf86dga = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { name = "libXxf86dga-1.1.5"; builder = ./builder.sh; src = fetchurl { @@ -1074,12 +1074,12 @@ lib.makeScope newScope (self: with self; { sha256 = "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXxf86misc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + libXxf86misc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { name = "libXxf86misc-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -1087,12 +1087,12 @@ lib.makeScope newScope (self: with self; { sha256 = "107k593sx27vjz3v7gbb223add9i7w0bjc90gbb3jqpin3i07758"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXxf86vm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + libXxf86vm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { name = "libXxf86vm-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -1100,12 +1100,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libdmx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libdmx = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libdmx-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -1113,12 +1113,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0hvjfhrcym770cr0zpqajdy3cda30aiwbjzv16iafkqkbl090gr5"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libfontenc = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { + libfontenc = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { name = "libfontenc-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -1126,12 +1126,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto zlib ]; meta.platforms = lib.platforms.unix; }) {}; - libpciaccess = callPackage ({ stdenv, pkgconfig, fetchurl, zlib }: stdenv.mkDerivation { + libpciaccess = callPackage ({ stdenv, pkg-config, fetchurl, zlib }: stdenv.mkDerivation { name = "libpciaccess-0.16"; builder = ./builder.sh; src = fetchurl { @@ -1139,12 +1139,12 @@ lib.makeScope newScope (self: with self; { sha256 = "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ]; meta.platforms = lib.platforms.unix; }) {}; - libpthreadstubs = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + libpthreadstubs = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "libpthread-stubs-0.4"; builder = ./builder.sh; src = fetchurl { @@ -1152,12 +1152,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3 }: stdenv.mkDerivation { + libxcb = callPackage ({ stdenv, pkg-config, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3 }: stdenv.mkDerivation { name = "libxcb-1.14"; builder = ./builder.sh; src = fetchurl { @@ -1165,12 +1165,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ]; meta.platforms = lib.platforms.unix; }) {}; - libxkbfile = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + libxkbfile = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "libxkbfile-1.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1178,12 +1178,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - libxshmfence = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + libxshmfence = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "libxshmfence-1.3"; builder = ./builder.sh; src = fetchurl { @@ -1191,12 +1191,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - listres = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + listres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "listres-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -1204,12 +1204,12 @@ lib.makeScope newScope (self: with self; { sha256 = "041bxkvv6f92sm3hhm977c4gdqdv5r1jyxjqcqfi8vkrg3s2j4ka"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - lndir = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + lndir = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "lndir-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -1217,12 +1217,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - luit = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + luit = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "luit-20190106"; builder = ./builder.sh; src = fetchurl { @@ -1230,12 +1230,12 @@ lib.makeScope newScope (self: with self; { sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - makedepend = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + makedepend = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "makedepend-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -1243,12 +1243,12 @@ lib.makeScope newScope (self: with self; { sha256 = "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { + mkfontscale = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { name = "mkfontscale-1.2.1"; builder = ./builder.sh; src = fetchurl { @@ -1256,12 +1256,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc freetype xorgproto zlib ]; meta.platforms = lib.platforms.unix; }) {}; - oclock = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { + oclock = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { name = "oclock-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -1269,12 +1269,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1zmfzfmdp42nvapf0qz1bc3i3waq5sjrpkgfw64qs4nmq30wy86c"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxkbfile libX11 libXext libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; - sessreg = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + sessreg = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "sessreg-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -1282,12 +1282,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0crczl25zynkrslmm8sjaxszhrh4i33m7h5fg4wfdb3k8aarxjyz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - setxkbmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { + setxkbmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { name = "setxkbmap-1.3.2"; builder = ./builder.sh; src = fetchurl { @@ -1295,12 +1295,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1xdrxs65v7d0rw1yaz0vsz55w4hxym99216p085ya9978j379wlg"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile ]; meta.platforms = lib.platforms.unix; }) {}; - smproxy = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { + smproxy = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { name = "smproxy-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -1308,12 +1308,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libSM libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; - transset = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + transset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "transset-1.0.2"; builder = ./builder.sh; src = fetchurl { @@ -1321,12 +1321,12 @@ lib.makeScope newScope (self: with self; { sha256 = "088v8p0yfn4r3azabp6662hqikfs2gjb9xmjjd45gnngwwp19b2b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - twm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + twm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "twm-1.0.10"; builder = ./builder.sh; src = fetchurl { @@ -1334,12 +1334,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1ms5cj1w3g26zg6bxdv1j9hl0pxr4300qnv003cz1q3cl7ffljb4"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libSM libX11 libXext libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - utilmacros = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + utilmacros = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "util-macros-1.19.2"; builder = ./builder.sh; src = fetchurl { @@ -1347,12 +1347,12 @@ lib.makeScope newScope (self: with self; { sha256 = "04p7ydqxgq37jklnfj18b70zsifiz4h50wvrk94i2112mmv37r6p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - viewres = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXmu, libXt }: stdenv.mkDerivation { + viewres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt }: stdenv.mkDerivation { name = "viewres-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -1360,12 +1360,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1mz319kfmvcrdpi22dmdr91mif1j0j3ck1f8mmnz5g1r9kl1in2y"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; - x11perf = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { + x11perf = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { name = "x11perf-1.6.1"; builder = ./builder.sh; src = fetchurl { @@ -1373,12 +1373,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXft libXmu xorgproto libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - xauth = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation { + xauth = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation { name = "xauth-1.1"; builder = ./builder.sh; src = fetchurl { @@ -1386,12 +1386,12 @@ lib.makeScope newScope (self: with self; { sha256 = "032klzzw8r09z36x1272ssd79bcisz8j5p8gbdy111fiknvx27bd"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXau libXext libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xbacklight = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation { + xbacklight = callPackage ({ stdenv, pkg-config, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation { name = "xbacklight-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -1399,12 +1399,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1plssg0s3pbslg6rfzxp9sx8ryvn8l32zyvc8zp9zsbsfwjg69rs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb xcbutil ]; meta.platforms = lib.platforms.unix; }) {}; - xbitmaps = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + xbitmaps = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "xbitmaps-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -1412,12 +1412,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1vh73sc13s7w5r6gnc6irca56s7998bja7wgdivkfn8jccawgw5r"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xcalc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { + xcalc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { name = "xcalc-1.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1425,12 +1425,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1sxmlcb0sb3h4z05kl5l0kxnhrc0h8c74p9m3zdc7bv58jaldmym"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python3 }: stdenv.mkDerivation { + xcbproto = callPackage ({ stdenv, pkg-config, fetchurl, python3 }: stdenv.mkDerivation { name = "xcb-proto-1.14.1"; builder = ./builder.sh; src = fetchurl { @@ -1438,12 +1438,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1hzwazgyywd9mz4mjj1yv8ski27qqx7ypmyr27m39hrajyddsjph"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + xcbutil = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1451,12 +1451,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilcursor = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-cursor-0.1.3"; builder = ./builder.sh; src = fetchurl { @@ -1464,12 +1464,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xcbutilimage xcbutilrenderutil xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilerrors = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-errors-1.0"; builder = ./builder.sh; src = fetchurl { @@ -1477,12 +1477,12 @@ lib.makeScope newScope (self: with self; { sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xcbproto xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilimage = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilimage = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-image-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1490,12 +1490,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xcbutil xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilkeysyms = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilkeysyms = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-keysyms-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1503,12 +1503,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilrenderutil = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-renderutil-0.3.9"; builder = ./builder.sh; src = fetchurl { @@ -1516,12 +1516,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilwm = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { @@ -1529,12 +1529,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xclock = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { name = "xclock-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -1542,12 +1542,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1fr3q4rszgx7x2zxy2ip592a3fgx20hfwac49p2l5b7jqsr1ying"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xcmsdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11 }: stdenv.mkDerivation { + xcmsdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11 }: stdenv.mkDerivation { name = "xcmsdb-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -1555,12 +1555,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - xcompmgr = callPackage ({ stdenv, pkgconfig, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { + xcompmgr = callPackage ({ stdenv, pkg-config, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { name = "xcompmgr-1.1.8"; builder = ./builder.sh; src = fetchurl { @@ -1568,12 +1568,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0hvjkanrdlvk3ln5a1jx3c9ggziism2jr1na7jl3zyk0y3sdm28b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXcomposite libXdamage libXext libXfixes libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - xconsole = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "xconsole-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -1581,12 +1581,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1q2ib1626i5da0nda09sp3vzppjrcn82fff83cw7hwr0vy14h56i"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xcursorgen = callPackage ({ stdenv, pkgconfig, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { + xcursorgen = callPackage ({ stdenv, pkg-config, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { name = "xcursorgen-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -1594,12 +1594,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng libX11 libXcursor ]; meta.platforms = lib.platforms.unix; }) {}; - xcursorthemes = callPackage ({ stdenv, pkgconfig, fetchurl, libXcursor }: stdenv.mkDerivation { + xcursorthemes = callPackage ({ stdenv, pkg-config, fetchurl, libXcursor }: stdenv.mkDerivation { name = "xcursor-themes-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -1607,12 +1607,12 @@ lib.makeScope newScope (self: with self; { sha256 = "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXcursor ]; meta.platforms = lib.platforms.unix; }) {}; - xdm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { name = "xdm-1.1.12"; builder = ./builder.sh; src = fetchurl { @@ -1620,12 +1620,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1x17hdymf6rd8jmh4n1sd4g5a8ayr5w94nwjw84qs2fs5pvq7lhd"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xdpyinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xorgproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { + xdpyinfo = callPackage ({ stdenv, pkg-config, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xorgproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { name = "xdpyinfo-1.3.2"; builder = ./builder.sh; src = fetchurl { @@ -1633,12 +1633,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xorgproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; meta.platforms = lib.platforms.unix; }) {}; - xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation { + xdriinfo = callPackage ({ stdenv, pkg-config, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation { name = "xdriinfo-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -1646,12 +1646,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0lcx8h3zd11m4w8wf7dyp89826d437iz78cyrix436bqx31x5k6r"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGL xorgproto libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - xev = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { + xev = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { name = "xev-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -1659,12 +1659,12 @@ lib.makeScope newScope (self: with self; { sha256 = "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXrandr ]; meta.platforms = lib.platforms.unix; }) {}; - xeyes = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xeyes = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { name = "xeyes-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -1672,12 +1672,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0lq5j7fryx1wn998jq6h3icz1h6pqrsbs3adskjzjyhn5l6yrg2p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXmu xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation { + xf86inputevdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation { name = "xf86-input-evdev-2.10.6"; builder = ./builder.sh; src = fetchurl { @@ -1685,12 +1685,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1h1y0fwnawlp4yc5llr1l7hwfcxxpln2fxhy6arcf6w6h4z0f9l7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libevdev udev mtdev xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputjoystick = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86inputjoystick = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-input-joystick-1.6.3"; builder = ./builder.sh; src = fetchurl { @@ -1698,12 +1698,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputkeyboard = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86inputkeyboard = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-input-keyboard-1.9.0"; builder = ./builder.sh; src = fetchurl { @@ -1711,12 +1711,12 @@ lib.makeScope newScope (self: with self; { sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { + xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { name = "xf86-input-libinput-0.30.0"; builder = ./builder.sh; src = fetchurl { @@ -1724,12 +1724,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libinput xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputmouse = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86inputmouse = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-input-mouse-1.9.3"; builder = ./builder.sh; src = fetchurl { @@ -1737,12 +1737,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1iawr1wyl2qch1mqszcs0s84i92mh4xxprflnycbw1adc18b7v4k"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { + xf86inputsynaptics = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { name = "xf86-input-synaptics-1.9.1"; builder = ./builder.sh; src = fetchurl { @@ -1750,12 +1750,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0xhm03qywwfgkpfl904d08lx00y28m1b6lqmks5nxizixwk3by3s"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libevdev libX11 libXi xorgserver libXtst ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputvmmouse = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { + xf86inputvmmouse = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { name = "xf86-input-vmmouse-13.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1763,12 +1763,12 @@ lib.makeScope newScope (self: with self; { sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto udev xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputvoid = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { + xf86inputvoid = callPackage ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { name = "xf86-input-void-1.4.1"; builder = ./builder.sh; src = fetchurl { @@ -1776,12 +1776,12 @@ lib.makeScope newScope (self: with self; { sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgserver xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { + xf86videoamdgpu = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { name = "xf86-video-amdgpu-19.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1789,12 +1789,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0pgy4ihnja0vm8504qw7qxh3pdpa3p9k6967nz15m6b1mvha83jg"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto mesa libGL libdrm udev xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoapm = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoapm = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-apm-1.3.0"; builder = ./builder.sh; src = fetchurl { @@ -1802,12 +1802,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoark = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoark = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ark-0.7.5"; builder = ./builder.sh; src = fetchurl { @@ -1815,12 +1815,12 @@ lib.makeScope newScope (self: with self; { sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoast = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoast = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ast-1.1.5"; builder = ./builder.sh; src = fetchurl { @@ -1828,12 +1828,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoati = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ati-19.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1841,12 +1841,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0j9w4axsqlycv4v14g53xyhkm9h7d27b2fcv9lrzb9gf54b5m7v5"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto mesa libGL libdrm udev libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videochips = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-chips-1.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1854,12 +1854,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1gqzy7q9v824m7hqkbbmncxg082zm0d4mafgc97c4skyiwgf9wq7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videocirrus = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videocirrus = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-cirrus-1.5.3"; builder = ./builder.sh; src = fetchurl { @@ -1867,12 +1867,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videodummy = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videodummy = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-dummy-0.3.8"; builder = ./builder.sh; src = fetchurl { @@ -1880,12 +1880,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videofbdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videofbdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-fbdev-0.5.0"; builder = ./builder.sh; src = fetchurl { @@ -1893,12 +1893,12 @@ lib.makeScope newScope (self: with self; { sha256 = "16a66zr0l1lmssa07i3rzy07djxnb45c17ks8c71h8l06xgxihyw"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videogeode = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videogeode = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-geode-2.11.19"; builder = ./builder.sh; src = fetchurl { @@ -1906,12 +1906,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0zn9gb49grds5mcs1dlrx241k2w1sgqmx4i5x7v6159xxqhlqsf6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoglide = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videoglide = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-glide-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -1919,12 +1919,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoglint = callPackage ({ stdenv, pkgconfig, fetchurl, libpciaccess, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videoglint = callPackage ({ stdenv, pkg-config, fetchurl, libpciaccess, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-glint-1.2.9"; builder = ./builder.sh; src = fetchurl { @@ -1932,12 +1932,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpciaccess xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoi128 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoi128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-i128-1.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1945,12 +1945,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1snhpv1igrhifcls3r498kjd14ml6x2xvih7zk9xlsd1ymmhlb4g"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoi740 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoi740 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-i740-1.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1958,12 +1958,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0l3s1m95bdsg4gki943qipq8agswbb84dzcflpxa3vlckwhh3r26"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { + xf86videointel = callPackage ({ stdenv, pkg-config, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; src = fetchurl { @@ -1971,12 +1971,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videomach64 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videomach64 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-mach64-6.9.6"; builder = ./builder.sh; src = fetchurl { @@ -1984,12 +1984,12 @@ lib.makeScope newScope (self: with self; { sha256 = "171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videomga = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-mga-2.0.0"; builder = ./builder.sh; src = fetchurl { @@ -1997,12 +1997,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoneomagic = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoneomagic = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-neomagic-1.3.0"; builder = ./builder.sh; src = fetchurl { @@ -2010,12 +2010,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0r4h673kw8fl7afc30anwbjlbhp82mg15fvaxf470xg7z983k0wk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videonewport = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videonewport = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-newport-0.2.4"; builder = ./builder.sh; src = fetchurl { @@ -2023,12 +2023,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videonouveau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videonouveau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-nouveau-1.0.16"; builder = ./builder.sh; src = fetchurl { @@ -2036,12 +2036,12 @@ lib.makeScope newScope (self: with self; { sha256 = "01mz8gnq7j6bvrqb2ljm3d1wpjhi9p2z2w8zbkdrqmqmcj060h1h"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videonv = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videonv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-nv-2.1.21"; builder = ./builder.sh; src = fetchurl { @@ -2049,12 +2049,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoomap = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, xorgserver }: stdenv.mkDerivation { + xf86videoomap = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, xorgserver }: stdenv.mkDerivation { name = "xf86-video-omap-0.4.5"; builder = ./builder.sh; src = fetchurl { @@ -2062,12 +2062,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0nmbrx6913dc724y8wj2p6vqfbj5zdjfmsl037v627jj0whx9rwk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoopenchrome = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, libXvMC }: stdenv.mkDerivation { + xf86videoopenchrome = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, libXvMC }: stdenv.mkDerivation { name = "xf86-video-openchrome-0.6.0"; builder = ./builder.sh; src = fetchurl { @@ -2075,12 +2075,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver libXvMC ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoqxl = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoqxl = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-qxl-0.1.5"; builder = ./builder.sh; src = fetchurl { @@ -2088,12 +2088,12 @@ lib.makeScope newScope (self: with self; { sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videor128 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videor128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-r128-6.11.0"; builder = ./builder.sh; src = fetchurl { @@ -2101,12 +2101,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0snvwmrh8dqyyaq7ggicym6yrsg4brygkx9156r0m095m7fp3rav"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videorendition = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videorendition = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-rendition-4.2.7"; builder = ./builder.sh; src = fetchurl { @@ -2114,12 +2114,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0yzqcdfrnnyaaaa76d4hpwycpq4x2j8qvg9m4q19lj4xbicwc4cm"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videos3virge = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videos3virge = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-s3virge-1.11.0"; builder = ./builder.sh; src = fetchurl { @@ -2127,12 +2127,12 @@ lib.makeScope newScope (self: with self; { sha256 = "06d1v5s7xf00y18x12cz11sk00rgn0yq95w66kmgzy465pzxvj84"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosavage = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videosavage = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-savage-2.3.9"; builder = ./builder.sh; src = fetchurl { @@ -2140,12 +2140,12 @@ lib.makeScope newScope (self: with self; { sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosiliconmotion = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videosiliconmotion = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-siliconmotion-1.7.9"; builder = ./builder.sh; src = fetchurl { @@ -2153,12 +2153,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosis = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videosis = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-sis-0.11.0"; builder = ./builder.sh; src = fetchurl { @@ -2166,12 +2166,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0srvrhydjnynfb7b1s145rgmsk4f71iz0ag4icpmb05944d90xr1"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosisusb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videosisusb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-sisusb-0.9.7"; builder = ./builder.sh; src = fetchurl { @@ -2179,12 +2179,12 @@ lib.makeScope newScope (self: with self; { sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosuncg6 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videosuncg6 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-suncg6-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -2192,12 +2192,12 @@ lib.makeScope newScope (self: with self; { sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosunffb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videosunffb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-sunffb-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2205,12 +2205,12 @@ lib.makeScope newScope (self: with self; { sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosunleo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videosunleo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-sunleo-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2218,12 +2218,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videotdfx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videotdfx = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-tdfx-1.5.0"; builder = ./builder.sh; src = fetchurl { @@ -2231,12 +2231,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videotga = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videotga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-tga-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2244,12 +2244,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videotrident = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videotrident = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-trident-1.3.8"; builder = ./builder.sh; src = fetchurl { @@ -2257,12 +2257,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videov4l = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videov4l = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-v4l-0.3.0"; builder = ./builder.sh; src = fetchurl { @@ -2270,12 +2270,12 @@ lib.makeScope newScope (self: with self; { sha256 = "084x4p4avy72mgm2vnnvkicw3419i6pp3wxik8zqh7gmq4xv5z75"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videovboxvideo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videovboxvideo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-vboxvideo-1.0.0"; builder = ./builder.sh; src = fetchurl { @@ -2283,12 +2283,12 @@ lib.makeScope newScope (self: with self; { sha256 = "195z1js3i51qgxvhfw4bxb4dw3jcrrx2ynpm2y3475dypjzs7dkz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videovesa = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videovesa = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-vesa-2.5.0"; builder = ./builder.sh; src = fetchurl { @@ -2296,12 +2296,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0nf6ai74c60xk96kgr8q9mx6lrxm5id3765ws4d801irqzrj85hz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videovmware = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver }: stdenv.mkDerivation { + xf86videovmware = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver }: stdenv.mkDerivation { name = "xf86-video-vmware-13.3.0"; builder = ./builder.sh; src = fetchurl { @@ -2309,12 +2309,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0v06qhm059klq40m2yx4wypzb7h53aaassbjfmm6clcyclj1k5s7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videovoodoo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videovoodoo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-voodoo-1.2.5"; builder = ./builder.sh; src = fetchurl { @@ -2322,12 +2322,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videowsfb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { + xf86videowsfb = callPackage ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { name = "xf86-video-wsfb-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -2335,12 +2335,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgserver xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoxgi = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoxgi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-xgi-1.6.1"; builder = ./builder.sh; src = fetchurl { @@ -2348,12 +2348,12 @@ lib.makeScope newScope (self: with self; { sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xfd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation { + xfd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation { name = "xfd-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2361,12 +2361,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xfontsel = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { + xfontsel = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { name = "xfontsel-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2374,12 +2374,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xfs = callPackage ({ stdenv, pkgconfig, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { + xfs = callPackage ({ stdenv, pkg-config, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { name = "xfs-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -2387,12 +2387,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0q4q4rbzx159sfn2n52y039fki6nc6a39qdfxa78yjc3aw8i48nv"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXfont2 xorgproto xtrans ]; meta.platforms = lib.platforms.unix; }) {}; - xfsinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { + xfsinfo = callPackage ({ stdenv, pkg-config, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { name = "xfsinfo-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2400,12 +2400,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1mmir5i7gm71xc0ba8vnizi4744vsd31hknhi4cmgvg6kadqngla"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libFS xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xgamma = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { + xgamma = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { name = "xgamma-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2413,12 +2413,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXxf86vm ]; meta.platforms = lib.platforms.unix; }) {}; - xgc = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + xgc = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { name = "xgc-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2426,12 +2426,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xhost = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { + xhost = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { name = "xhost-1.0.8"; builder = ./builder.sh; src = fetchurl { @@ -2439,12 +2439,12 @@ lib.makeScope newScope (self: with self; { sha256 = "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXau libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xinit = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xinit = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xinit-1.4.1"; builder = ./builder.sh; src = fetchurl { @@ -2452,12 +2452,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1fdbakx59vyh474skjydj1bbglpby3y03nl7mxn0z9v8gdhqz6yy"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { + xinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { name = "xinput-1.6.3"; builder = ./builder.sh; src = fetchurl { @@ -2465,12 +2465,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1vb6xdd1xmk5f7pwc5zcbxfray5sf1vbnscqwf2yl8lv7gfq38im"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXi libXinerama libXrandr ]; meta.platforms = lib.platforms.unix; }) {}; - xkbcomp = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { + xkbcomp = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { name = "xkbcomp-1.4.4"; builder = ./builder.sh; src = fetchurl { @@ -2478,12 +2478,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0zpjkbap9160pdd6jpgb5f0yg5281w0rkkx1l0i7g887lq1ydk2r"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xkbevd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { + xkbevd = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { name = "xkbevd-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -2491,12 +2491,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile ]; meta.platforms = lib.platforms.unix; }) {}; - xkbprint = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { + xkbprint = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { name = "xkbprint-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2504,12 +2504,12 @@ lib.makeScope newScope (self: with self; { sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xkbutils = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXaw, libXt }: stdenv.mkDerivation { + xkbutils = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXaw, libXt }: stdenv.mkDerivation { name = "xkbutils-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2517,12 +2517,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, python3 }: stdenv.mkDerivation { + xkeyboardconfig = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, python3 }: stdenv.mkDerivation { name = "xkeyboard-config-2.31"; builder = ./builder.sh; src = fetchurl { @@ -2530,12 +2530,12 @@ lib.makeScope newScope (self: with self; { sha256 = "18xddaxh83zm698syh50w983jg6b7b8zgv0dfaf7ha485hgihi6s"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xkill = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + xkill = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { name = "xkill-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2543,12 +2543,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xload = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation { + xload = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation { name = "xload-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2556,12 +2556,12 @@ lib.makeScope newScope (self: with self; { sha256 = "01sr6yd6yhyyfgn88l867w6h9dn5ikcynaz5rwji6xqxhw1lhkpk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xlsatoms = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { + xlsatoms = callPackage ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { name = "xlsatoms-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2569,12 +2569,12 @@ lib.makeScope newScope (self: with self; { sha256 = "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb ]; meta.platforms = lib.platforms.unix; }) {}; - xlsclients = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { + xlsclients = callPackage ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { name = "xlsclients-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -2582,12 +2582,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1h8931sn34mcip6vpi4v7hdmr1r58gkbw4s2p97w98kykks2lgvp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb ]; meta.platforms = lib.platforms.unix; }) {}; - xlsfonts = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xlsfonts = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xlsfonts-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2595,12 +2595,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0s6kxgv78chkwsqmhw929f4pf91gq63f4yvixxnan1h00cx0pf49"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xmag = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { + xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { name = "xmag-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2608,12 +2608,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xmessage = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + xmessage = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { name = "xmessage-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2621,12 +2621,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0a90kfm0qz8cn2pbpqfyqrc5s9bfvvy14nj848ynvw56wy0zng9p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xmodmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xmodmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xmodmap-1.0.10"; builder = ./builder.sh; src = fetchurl { @@ -2634,12 +2634,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xmore = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + xmore = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { name = "xmore-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -2647,12 +2647,12 @@ lib.makeScope newScope (self: with self; { sha256 = "06r514p30v87vx00ddlck9mwazaqk9bx08ip866p1mw2a46iwjk4"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xorgcffiles = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + xorgcffiles = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "xorg-cf-files-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2660,12 +2660,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xorgdocs = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + xorgdocs = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "xorg-docs-1.7.1"; builder = ./builder.sh; src = fetchurl { @@ -2673,12 +2673,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xorgproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXt }: stdenv.mkDerivation { + xorgproto = callPackage ({ stdenv, pkg-config, fetchurl, libXt }: stdenv.mkDerivation { name = "xorgproto-2020.1"; builder = ./builder.sh; src = fetchurl { @@ -2686,12 +2686,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1llrnrkq6iprgiqakmwlv89745s9h02xsiaq0xn3fnh377qm78al"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { + xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { name = "xorg-server-1.20.10"; builder = ./builder.sh; src = fetchurl { @@ -2699,12 +2699,12 @@ lib.makeScope newScope (self: with self; { sha256 = "16bwrf0ag41l7jbrllbix8z6avc5yimga7ihvq4ch3a5hb020x4p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xorgsgmldoctools = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + xorgsgmldoctools = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "xorg-sgml-doctools-1.11"; builder = ./builder.sh; src = fetchurl { @@ -2712,12 +2712,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xpr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + xpr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { name = "xpr-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2725,12 +2725,12 @@ lib.makeScope newScope (self: with self; { sha256 = "07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xprop = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xprop-1.2.5"; builder = ./builder.sh; src = fetchurl { @@ -2738,12 +2738,12 @@ lib.makeScope newScope (self: with self; { sha256 = "18ckr8g1z50zkc01hprkpm1npwbq32yqib4b3l98c95z2q1yv4lv"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xrandr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation { + xrandr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation { name = "xrandr-1.5.1"; builder = ./builder.sh; src = fetchurl { @@ -2751,12 +2751,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0ql75s1n3dm2m3g1ilb9l6hqh15r0v709bgghpwazy3jknpnvivv"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXrandr libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - xrdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + xrdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { name = "xrdb-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -2764,12 +2764,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xrefresh = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xrefresh = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xrefresh-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2777,12 +2777,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0lv3rlshh7s0z3aqx5ahnnf8cl082m934bk7gv881mz8nydznz98"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xset = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { + xset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { name = "xset-1.2.4"; builder = ./builder.sh; src = fetchurl { @@ -2790,12 +2790,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXmu xorgproto libXxf86misc ]; meta.platforms = lib.platforms.unix; }) {}; - xsetroot = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xbitmaps, libXcursor, libXmu, xorgproto }: stdenv.mkDerivation { + xsetroot = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xbitmaps, libXcursor, libXmu, xorgproto }: stdenv.mkDerivation { name = "xsetroot-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -2803,12 +2803,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0z21mqvmdl6rl63q77479wgkfygnll57liza1i3va7sr4fx45i0h"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xbitmaps libXcursor libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xsm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXaw, libXt }: stdenv.mkDerivation { + xsm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, libXt }: stdenv.mkDerivation { name = "xsm-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2816,12 +2816,12 @@ lib.makeScope newScope (self: with self; { sha256 = "09a4ss1fnrh1sgm21r4n5pivawf34paci3rn6mscyljf7a4vcd4r"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libSM libX11 libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xstdcmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + xstdcmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { name = "xstdcmap-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2829,12 +2829,12 @@ lib.makeScope newScope (self: with self; { sha256 = "12vgzsxv4rw25frkgjyli6w6hy10lgpvsx9wzw2v5l5a3qzqp286"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xtrans = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + xtrans = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "xtrans-1.4.0"; builder = ./builder.sh; src = fetchurl { @@ -2842,12 +2842,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0wyp0yc6gi72hwc3kjmvm3vkj9p6s407cb6dxx37jh9wb68l8z1p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xtrap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXt, libXTrap }: stdenv.mkDerivation { + xtrap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXt, libXTrap }: stdenv.mkDerivation { name = "xtrap-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -2855,12 +2855,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0sqm4j1zflk1s94iq4waa70hna1xcys88v9a70w0vdw66czhvj2j"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXt libXTrap ]; meta.platforms = lib.platforms.unix; }) {}; - xvinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { + xvinfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { name = "xvinfo-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -2868,12 +2868,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXv ]; meta.platforms = lib.platforms.unix; }) {}; - xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { + xwd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { name = "xwd-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -2881,12 +2881,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1537i8q8pgf0sjklakzfvjwrq5b246qjywrx9ll8xfg0p6w1as6d"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxkbfile libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xwininfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxcb, xorgproto }: stdenv.mkDerivation { + xwininfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxcb, xorgproto }: stdenv.mkDerivation { name = "xwininfo-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -2894,12 +2894,12 @@ lib.makeScope newScope (self: with self; { sha256 = "00avrpw4h5mr1klp41lv2j4dmq465v6l5kb5bhm4k5ml8sm9i543"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxcb xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xwud = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xwud = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xwud-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2907,7 +2907,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index a6cd8032ba7..b50f3f33a31 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -292,7 +292,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { my @arguments = @buildInputs; push @arguments, @nativeBuildInputs; - unshift @arguments, "stdenv", "pkgconfig", "fetchurl"; + unshift @arguments, "stdenv", "pkg-config", "fetchurl"; my $argumentsStr = join ", ", @arguments; my $extraAttrsStr = ""; @@ -309,7 +309,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { sha256 = "$pkgHashes{$pkg}"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig $nativeBuildInputsStr]; + nativeBuildInputs = [ pkg-config $nativeBuildInputsStr]; buildInputs = [ $buildInputsStr];$extraAttrsStr meta.platforms = lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1379b3b19c5..458bc7ea845 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -4,7 +4,7 @@ freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, - mcpp, epoxy, openssl, pkgconfig, llvm_6, libxslt, + mcpp, epoxy, openssl, pkg-config, llvm_6, libxslt, ApplicationServices, Carbon, Cocoa, Xplugin }: @@ -467,7 +467,7 @@ self: super: configureFlags = [ "--with-xkb-rules-symlink=xorg" ]; # 1: compatibility for X11/xkb location - # 2: I think pkgconfig/ is supposed to be in /lib/ + # 2: I think pkg-config/ is supposed to be in /lib/ postInstall = '' ln -s share "$out/etc" mkdir -p "$out/lib" && ln -s ../share/pkgconfig "$out/lib/" @@ -589,7 +589,7 @@ self: super: url = "mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2"; sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = lib.platforms.unix; } else if (abiCompat == "1.18") then { @@ -599,7 +599,7 @@ self: super: url = "mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2"; sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; postPatch = lib.optionalString stdenv.isLinux "sed '1i#include ' -i include/os.h"; meta.platforms = lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index cc8bf7dfa10..ee870f07125 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }: +{ lib, stdenv, fetchurl, pkg-config, m4, libxcb, xcbutil, libX11 }: stdenv.mkDerivation rec { version = "1.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "118cj1ybw86pgw0l5whn9vbg5n5b0ijcpx295mwahzi004vz671h"; }; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; doCheck = true; buildInputs = [ libxcb xcbutil ]; checkInputs = [ libX11 ]; diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index deaa7ca18f0..762154f018c 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn, - libiconv, botan2, systemd, pkgconfig, udns, pandoc, coreutils } : + libiconv, botan2, systemd, pkg-config, udns, pandoc, coreutils } : stdenv.mkDerivation rec { pname = "biboumi"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = [ ./catch.patch ]; - nativeBuildInputs = [ cmake pkgconfig pandoc ]; + nativeBuildInputs = [ cmake pkg-config pandoc ]; buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd udns ]; diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index babcd8e6374..0ae93ed1469 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkgconfig +{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkg-config , curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages , polkit, util-linuxMinimal, x264, zlib , coreutils, procps, psmisc, nixosTests }: @@ -157,7 +157,7 @@ in stdenv.mkDerivation rec { CryptEksblowfish DataEntropy # zmupdate.pl ]); - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; cmakeFlags = [ "-DWITH_SYSTEMD=ON" diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/tools/bluetooth/obexftp/default.nix index 24a93ee686c..fc2ff6128f7 100644 --- a/pkgs/tools/bluetooth/obexftp/default.nix +++ b/pkgs/tools/bluetooth/obexftp/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, openobex, bluez, cmake }: - + stdenv.mkDerivation rec { name = "obexftp-0.24.2"; - + src = fetchurl { url = "mirror://sourceforge/openobex/${name}-Source.tar.gz"; sha256 = "18w9r78z78ri5qc8fjym4nk1jfbrkyr789sq7rxrkshf1a7b83yl"; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 95a81bba210..89f44e8bb7b 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, perl +{ stdenv, lib, fetchurl, pkg-config, perl , http2Support ? true, nghttp2 , idnSupport ? false, libidn ? null , ldapSupport ? false, openldap ? null @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; # Zlib and OpenSSL must be propagated because `libcurl.la' contains # "-lz -lssl", which aren't necessary direct build inputs of diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 22dd825b1fe..cc1ef049c97 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -471,6 +471,8 @@ mapAliases ({ pidginsipe = pidgin-sipe; # added 2018-01-08 pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 piwik = matomo; # added 2018-01-16 + pkgconfig = pkg-config; # added 2018-02-02, moved to aliases.nix 2021-01-18 + pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 pltScheme = racket; # just to be sure plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22 pmtools = acpica-tools; # added 2018-11-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 393bb16da56..2bddee22659 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -398,7 +398,7 @@ in # break dependency cycles fetchurl = stdenv.fetchurlBoot; zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; - pkgconfig = buildPackages.pkgconfig.override (old: { + pkg-config = buildPackages.pkg-config.override (old: { pkg-config = old.pkg-config.override { fetchurl = stdenv.fetchurlBoot; }; @@ -431,12 +431,12 @@ in else old.gssSupport or true; # `? true` is the default libkrb5 = buildPackages.libkrb5.override { fetchurl = stdenv.fetchurlBoot; - inherit pkgconfig perl openssl; + inherit pkg-config perl openssl; keyutils = buildPackages.keyutils.override { fetchurl = stdenv.fetchurlBoot; }; }; nghttp2 = buildPackages.nghttp2.override { fetchurl = stdenv.fetchurlBoot; - inherit zlib pkgconfig openssl; + inherit zlib pkg-config openssl; c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; }; @@ -580,7 +580,7 @@ in iconConvTools = callPackage ../build-support/icon-conv-tools {}; validatePkgConfig = makeSetupHook - { name = "validate-pkg-config"; deps = [ findutils pkgconfig ]; } + { name = "validate-pkg-config"; deps = [ findutils pkg-config ]; } ../build-support/setup-hooks/validate-pkg-config.sh; #package writers @@ -9804,7 +9804,7 @@ in langCC = false; langC = false; profiledCompiler = false; - inherit zip unzip zlib boehmgc gettext pkgconfig perl; + inherit zip unzip zlib boehmgc gettext pkg-config perl; inherit (gnome2) libart_lgpl; }); @@ -12420,14 +12420,12 @@ in pkg-config = callPackage ../build-support/pkg-config-wrapper { pkg-config = pkg-config-unwrapped; }; - pkgconfig = pkg-config; # added 2018-02-02 pkg-configUpstream = lowPrio (pkg-config.override (old: { pkg-config = old.pkg-config.override { vanilla = true; }; })); - pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 inherit (nodePackages) postcss-cli; @@ -21575,7 +21573,7 @@ in inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent; inherit - autoconf automake editorconfig-core-c git libffi libpng pkgconfig + autoconf automake editorconfig-core-c git libffi libpng pkg-config poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages libtool zeromq openssl ott; }; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 91c1549a3b0..0b2b6af8038 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -6,7 +6,7 @@ , fetchFromGitHub , fetchNuGet , glib -, pkgconfig +, pkg-config , mono , fsharp , unzip @@ -860,7 +860,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { buildInputs = [ mono - pkgconfig + pkg-config ]; postInstall = '' diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index ff636097004..9ae97cdf35a 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -10,7 +10,7 @@ rec { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation (old: { - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ zlib ]; buildInputs = old.buildInputs ++ [ automake autoconf ]; configurePhase = '' @@ -49,7 +49,7 @@ rec { }).overrideDerivation (old: { propagatedBuildInputs = [ zlib ]; - buildInputs = old.buildInputs ++ [ pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkg-config ]; # just override it with nothing so it does not fail autoreconfPhase = "echo autoreconfPhase not used..."; @@ -84,8 +84,8 @@ rec { pname = "xmlmirror"; version = "unstable-2016-06-05"; - buildInputs = [ pkgconfig autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; - nativeBuildInputs = [ pkgconfig zlib ]; + buildInputs = [ pkg-config autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; + nativeBuildInputs = [ pkg-config zlib ]; src = pkgs.fetchgit { url = "https://gitlab.com/odfplugfest/xmlmirror.git"; @@ -136,7 +136,7 @@ rec { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation (old: { - buildInputs = old.buildInputs ++ [ pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkg-config ]; # we need to reset this setting! NIX_CFLAGS_COMPILE=""; configurePhase = '' diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 550c5bbd63b..b42f827d0df 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -5,7 +5,7 @@ for each package in a separate file: the call to the function would be almost as must code as the function itself. */ -{ fetchurl, stdenv, lua, unzip, pkgconfig +{ fetchurl, stdenv, lua, unzip, pkg-config , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat , autoreconfHook, gnum4 , mysql, postgresql, cyrus_sasl @@ -108,7 +108,7 @@ with self; { sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz"; }; - nativeBuildInputs = [ which pkgconfig ]; + nativeBuildInputs = [ which pkg-config ]; postPatch = '' patchShebangs . diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index de358159287..a9c0c79ba8b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -283,7 +283,7 @@ let url = "mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.69.tar.gz"; sha256 = "0jg2dmkzhj03f6b0vmv597yryfw9cclsdn9ynvvlrzzgpd5lw8jk"; }; - propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK30 ModulePluggable ]; + propagatedBuildInputs = [ pkgs.pkg-config pkgs.gtk2 pkgs.wxGTK30 ModulePluggable ]; buildInputs = [ LWPProtocolHttps ]; }; @@ -7503,8 +7503,8 @@ let url = "mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-1.16.tar.gz"; sha256 = "bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e"; }; - nativeBuildInputs = [ buildPackages.pkgconfig ]; - propagatedBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ buildPackages.pkg-config ]; + propagatedBuildInputs = [ pkgs.pkg-config ]; doCheck = false; # expects test_glib-2.0.pc in PKG_CONFIG_PATH meta = { homepage = "http://gtk2-perl.sourceforge.net"; @@ -9005,7 +9005,7 @@ let url = "mirror://cpan/authors/id/O/OE/OESTERHOL/Gtk2-AppIndicator-0.15.tar.gz"; sha256 = "a25cb071e214fb89b4450aa4605031eae89b7961e149b0d6e8f491c19c14a90a"; }; - propagatedBuildInputs = [ pkgs.libappindicator-gtk2 pkgs.libdbusmenu-gtk2 pkgs.gtk2 pkgs.pkgconfig Gtk2 ]; + propagatedBuildInputs = [ pkgs.libappindicator-gtk2 pkgs.libdbusmenu-gtk2 pkgs.gtk2 pkgs.pkg-config Gtk2 ]; # Tests fail due to no display: # Gtk-WARNING **: cannot open display: at /nix/store/HASH-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 126. doCheck = false; @@ -11724,7 +11724,7 @@ let url = "mirror://cpan/authors/id/L/LK/LKUNDRAK/Log-Journald-0.30.tar.gz"; sha256 = "55992cf9a1e1fb833f428300525bfa7cf7ed46b83ec414f82a091789b37d08a3"; }; - buildInputs = [ pkgs.pkgconfig pkgs.systemd ]; + buildInputs = [ pkgs.pkg-config pkgs.systemd ]; postPatch = '' substituteInPlace Build.PL \ --replace "libsystemd-journal" "libsystemd" @@ -14674,7 +14674,7 @@ let # Makefile.PL in this package uses which to find pkg-config -- make it use path instead patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Makefile.PL''; doCheck = false; # The main test performs network access - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; propagatedBuildInputs = [ pkgs.libdiscid ]; }; @@ -14967,7 +14967,7 @@ let url = "mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.2.0.tar.gz"; sha256 = "e7a1ac9ef4a1235b3fdbd5888f86c347182306467bd79abc9b0756a64b441cbc"; }; - nativeBuildInputs = [ buildPackages.pkgconfig ]; + nativeBuildInputs = [ buildPackages.pkg-config ]; buildInputs = [ pkgs.dbus TestPod TestPodCoverage ]; propagatedBuildInputs = [ XMLTwig ]; @@ -16310,7 +16310,7 @@ let sha256 = "17f6i16jv6ci6459vh6y3sz94vgcvykjjszcl4xsykryakjvf8i7"; }; buildInputs = [ pkgs.pcsclite ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.pcsclite}/lib -lpcsclite"; # tests fail; look unfinished doCheck = false; @@ -19245,7 +19245,7 @@ let url = "mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-v6.3.0.tar.gz"; sha256 = "6333fe3c554322fec5a3e1890b08a4ea4f39b0fbb506b3592688a5785a488f39"; }; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' }; @@ -23131,7 +23131,7 @@ let url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.99.tar.gz"; sha256 = "1w7pn0wb88nma6biy4h05ak3j4ykma6vz1wbkrxy8qgvfyl1fzhj"; }; - buildInputs = [ pkgs.pkgconfig pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; + buildInputs = [ pkgs.pkg-config pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; propagatedBuildInputs = [ XMLLibXML ]; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index cb3cfdf7651..19feb36aa27 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fetchgit, phpPackage, autoconf, pkgconfig, re2c +{ stdenv, lib, pkgs, fetchgit, phpPackage, autoconf, pkg-config, re2c , gettext, bzip2, curl, libxml2, openssl, gmp, icu64, oniguruma, libsodium , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng @@ -176,7 +176,7 @@ lib.makeScope pkgs.newScope (self: with self; { "--with-zmq=${pkgs.zeromq}" ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; meta.maintainers = lib.teams.php.members; meta.broken = lib.versionAtLeast php.version "7.3"; @@ -206,7 +206,7 @@ lib.makeScope pkgs.newScope (self: with self; { sourceRoot = "php-${php.version}/ext/${name}"; enableParallelBuilding = true; - nativeBuildInputs = [ php.unwrapped autoconf pkgconfig re2c ]; + nativeBuildInputs = [ php.unwrapped autoconf pkg-config re2c ]; inherit configureFlags internalDeps buildInputs zendExtension doCheck; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8105cfbe0da..9dccc052333 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -541,7 +541,7 @@ in { withPython = true; }); - av = callPackage ../development/python-modules/av { inherit (pkgs) pkgconfig; }; + av = callPackage ../development/python-modules/av { inherit (pkgs) pkg-config; }; avea = callPackage ../development/python-modules/avea { }; @@ -1611,7 +1611,7 @@ in { dbus-next = callPackage ../development/python-modules/dbus-next { }; - dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkgconfig; }; + dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkg-config; }; dbutils = callPackage ../development/python-modules/dbutils { }; @@ -2411,7 +2411,7 @@ in { furl = callPackage ../development/python-modules/furl { }; - fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkgconfig; }; + fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkg-config; }; fusepy = callPackage ../development/python-modules/fusepy { }; @@ -2698,7 +2698,7 @@ in { inherit python; }); - gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkgconfig; }; + gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkg-config; }; gprof2dot = callPackage ../development/python-modules/gprof2dot { inherit (pkgs) graphviz; }; @@ -2777,7 +2777,7 @@ in { gssapi = callPackage ../development/python-modules/gssapi { inherit (pkgs) darwin krb5Full; }; gst-python = callPackage ../development/python-modules/gst-python { - inherit (pkgs) meson pkgconfig; + inherit (pkgs) meson pkg-config; gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; }; @@ -2925,7 +2925,7 @@ in { html5lib = callPackage ../development/python-modules/html5lib { }; - html5-parser = callPackage ../development/python-modules/html5-parser { inherit (pkgs) pkgconfig; }; + html5-parser = callPackage ../development/python-modules/html5-parser { inherit (pkgs) pkg-config; }; htmllaundry = callPackage ../development/python-modules/htmllaundry { }; @@ -3083,7 +3083,7 @@ in { importmagic = callPackage ../development/python-modules/importmagic { }; imread = - callPackage ../development/python-modules/imread { inherit (pkgs) pkgconfig libjpeg libpng libtiff libwebp; }; + callPackage ../development/python-modules/imread { inherit (pkgs) pkg-config libjpeg libpng libtiff libwebp; }; imutils = callPackage ../development/python-modules/imutils { }; @@ -3454,7 +3454,7 @@ in { kmsxx = toPythonModule ((callPackage ../development/libraries/kmsxx { inherit (pkgs.kmsxx) stdenv; - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; withPython = true; }).overrideAttrs (oldAttrs: { name = "${python.libPrefix}-${pkgs.kmsxx.name}"; })); @@ -3542,7 +3542,7 @@ in { libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; }; - libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns pkgconfig; }; + libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns pkg-config; }; libcloud = if isPy27 then callPackage ../development/python-modules/libcloud/2.nix { } @@ -3650,13 +3650,13 @@ in { libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; - libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion pkgconfig; }; + libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion pkg-config; }; libvirt = if isPy3k then - (callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt pkgconfig; }) + (callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt pkg-config; }) else (callPackage ../development/python-modules/libvirt/5.9.0.nix { - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; libvirt = pkgs.libvirt_5_9_0; }); @@ -3712,8 +3712,8 @@ in { livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; llfuse = callPackage ../development/python-modules/llfuse { - inherit (pkgs) fuse pkgconfig; - }; # use "real" fuse and pkgconfig, not the python modules + inherit (pkgs) fuse pkg-config; + }; # use "real" fuse and pkg-config, not the python modules llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm_9; @@ -3899,7 +3899,7 @@ in { in callPackage path { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; }; matrix-client = callPackage ../development/python-modules/matrix-client { }; @@ -4909,7 +4909,7 @@ in { poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { inherit (pkgs.qt5) qtbase; inherit (pkgs.libsForQt5) poppler; - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; }; portalocker = callPackage ../development/python-modules/portalocker { }; @@ -5121,7 +5121,7 @@ in { pyarlo = callPackage ../development/python-modules/pyarlo { }; - pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake pkgconfig; }; + pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake pkg-config; }; pyasn1 = callPackage ../development/python-modules/pyasn1 { }; @@ -5129,7 +5129,7 @@ in { pyatmo = callPackage ../development/python-modules/pyatmo { }; - pyatspi = callPackage ../development/python-modules/pyatspi { inherit (pkgs) pkgconfig; }; + pyatspi = callPackage ../development/python-modules/pyatspi { inherit (pkgs) pkg-config; }; pyatv = callPackage ../development/python-modules/pyatv { }; @@ -5175,7 +5175,7 @@ in { py = callPackage ../development/python-modules/py { }; - pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { inherit (pkgs) pkgconfig; }); + pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { inherit (pkgs) pkg-config; }); pycapnp = callPackage ../development/python-modules/pycapnp { }; @@ -5385,19 +5385,19 @@ in { pygmt = callPackage ../development/python-modules/pygmt { }; - pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkgconfig; }; + pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkg-config; }; pygobject3 = if isPy3k then - callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; } + callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkg-config; } else - callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson pkgconfig; }; + callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson pkg-config; }; pygogo = callPackage ../development/python-modules/pygogo { }; pygpgme = callPackage ../development/python-modules/pygpgme { }; pygraphviz = callPackage ../development/python-modules/pygraphviz { - inherit (pkgs) graphviz pkgconfig; + inherit (pkgs) graphviz pkg-config; }; # not the python package pygreat = callPackage ../development/python-modules/pygreat { }; @@ -5407,13 +5407,13 @@ in { pygtail = callPackage ../development/python-modules/pygtail { }; pygtk = callPackage ../development/python-modules/pygtk { - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; libglade = null; }; pyGtkGlade = self.pygtk.override { libglade = pkgs.gnome2.libglade; }; - pygtksourceview = callPackage ../development/python-modules/pygtksourceview { inherit (pkgs) pkgconfig; }; + pygtksourceview = callPackage ../development/python-modules/pygtksourceview { inherit (pkgs) pkg-config; }; pygtrie = callPackage ../development/python-modules/pygtrie { }; @@ -5708,7 +5708,7 @@ in { pyqrcode = callPackage ../development/python-modules/pyqrcode { }; - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkg-config; }; pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; @@ -5849,7 +5849,7 @@ in { pysmb = callPackage ../development/python-modules/pysmb { }; - pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkgconfig; }; + pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkg-config; }; pysmf = callPackage ../development/python-modules/pysmf { }; @@ -6165,7 +6165,7 @@ in { python-editor = callPackage ../development/python-modules/python-editor { }; - pythonefl = callPackage ../development/python-modules/python-efl { inherit (pkgs) pkgconfig; }; + pythonefl = callPackage ../development/python-modules/python-efl { inherit (pkgs) pkg-config; }; python-engineio = callPackage ../development/python-modules/python-engineio { }; @@ -6188,7 +6188,7 @@ in { python-hpilo = callPackage ../development/python-modules/python-hpilo { }; python-igraph = callPackage ../development/python-modules/python-igraph { - pkgconfig = pkgs.pkgconfig; + pkg-config = pkgs.pkg-config; igraph = pkgs.igraph; }; @@ -6250,7 +6250,7 @@ in { pythonnet = callPackage ../development/python-modules/pythonnet { # `mono >= 4.6` required to prevent crashes encountered with earlier versions. mono = pkgs.mono4; - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; }; python-nomad = callPackage ../development/python-modules/python-nomad { }; @@ -6266,7 +6266,7 @@ in { python-opendata-transport = callPackage ../development/python-modules/python-opendata-transport { }; - python_openzwave = callPackage ../development/python-modules/python_openzwave { inherit (pkgs) pkgconfig; }; + python_openzwave = callPackage ../development/python-modules/python_openzwave { inherit (pkgs) pkg-config; }; python-otr = callPackage ../development/python-modules/python-otr { }; @@ -6706,7 +6706,7 @@ in { robomachine = callPackage ../development/python-modules/robomachine { }; roboschool = callPackage ../development/python-modules/roboschool { - inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package + inherit (pkgs) pkg-config; # use normal pkg-config, not the python package inherit (pkgs.qt5) qtbase; }; @@ -6940,7 +6940,7 @@ in { seccomp = callPackage ../development/python-modules/seccomp { }; - secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkgconfig; }; + secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkg-config; }; secretstorage = if isPy3k then callPackage ../development/python-modules/secretstorage { } @@ -6967,7 +6967,7 @@ in { send2trash = callPackage ../development/python-modules/send2trash { }; - sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece pkgconfig; }; + sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece pkg-config; }; sentinel = callPackage ../development/python-modules/sentinel { }; @@ -7456,7 +7456,7 @@ in { else callPackage ../development/python-modules/sympy/1_5.nix { }; - systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) pkgconfig systemd; }; + systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) pkg-config systemd; }; sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; @@ -7998,7 +7998,7 @@ in { vine = callPackage ../development/python-modules/vine { }; - virtkey = callPackage ../development/python-modules/virtkey { inherit (pkgs) pkgconfig; }; + virtkey = callPackage ../development/python-modules/virtkey { inherit (pkgs) pkg-config; }; virtual-display = callPackage ../development/python-modules/virtual-display { }; @@ -8187,11 +8187,11 @@ in { wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { wxGTK = pkgs.wxGTK30; - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; }; wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL; wxGTK = pkgs.wxGTK30.override { withGtk2 = false; @@ -8200,7 +8200,7 @@ in { }; wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix { - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; wxGTK = pkgs.wxGTK31.override { withGtk2 = false; withWebKit = true; @@ -8456,7 +8456,7 @@ in { zstandard = callPackage ../development/python-modules/zstandard { }; - zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd pkgconfig; }; + zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd pkg-config; }; zulip = callPackage ../development/python-modules/zulip { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 5e591ec7a85..a394c4d8eee 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -126,7 +126,7 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; pciutils = linux; pdf2xml = all; perl = all; - pkgconfig = all; + pkg-config = all; pmccabe = linux; procps = linux; python = unix; # Cygwin builds fail -- cgit 1.4.1 From 66e44425c6dfecbea68a5d6dc221ccd56561d4f1 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 22 Jan 2021 00:00:13 +0700 Subject: pkgs/development/libraries: stdenv.lib -> lib --- pkgs/development/libraries/AntTweakBar/default.nix | 8 ++--- pkgs/development/libraries/CGAL/4.nix | 4 +-- pkgs/development/libraries/CGAL/default.nix | 4 +-- pkgs/development/libraries/CoinMP/default.nix | 4 +-- pkgs/development/libraries/LAStools/default.nix | 4 +-- pkgs/development/libraries/LASzip/LASzip2.nix | 4 +-- pkgs/development/libraries/LASzip/default.nix | 8 ++--- pkgs/development/libraries/NSPlist/default.nix | 4 +-- pkgs/development/libraries/PlistCpp/default.nix | 4 +-- pkgs/development/libraries/SDL/default.nix | 8 ++--- pkgs/development/libraries/SDL2/default.nix | 8 ++--- pkgs/development/libraries/SDL2_gfx/default.nix | 8 ++--- pkgs/development/libraries/SDL2_image/default.nix | 8 ++--- pkgs/development/libraries/SDL2_mixer/default.nix | 8 ++--- pkgs/development/libraries/SDL2_net/default.nix | 8 ++--- pkgs/development/libraries/SDL2_ttf/default.nix | 8 ++--- pkgs/development/libraries/SDL_Pango/default.nix | 4 +-- pkgs/development/libraries/SDL_gfx/default.nix | 6 ++-- pkgs/development/libraries/SDL_gpu/default.nix | 4 +-- pkgs/development/libraries/SDL_image/default.nix | 6 ++-- pkgs/development/libraries/SDL_mixer/default.nix | 2 +- pkgs/development/libraries/SDL_net/default.nix | 6 ++-- pkgs/development/libraries/SDL_sixel/default.nix | 4 +-- pkgs/development/libraries/SDL_stretch/default.nix | 4 +-- pkgs/development/libraries/SDL_ttf/default.nix | 6 ++-- pkgs/development/libraries/Xaw3d/default.nix | 6 ++-- pkgs/development/libraries/a52dec/default.nix | 6 ++-- pkgs/development/libraries/aalib/default.nix | 8 ++--- pkgs/development/libraries/abseil-cpp/default.nix | 4 +-- .../libraries/accountsservice/default.nix | 4 +-- pkgs/development/libraries/ace/default.nix | 4 +-- pkgs/development/libraries/acl/default.nix | 4 +-- pkgs/development/libraries/afflib/default.nix | 10 +++--- pkgs/development/libraries/aften/default.nix | 4 +-- .../libraries/agda/agda-prelude/default.nix | 8 ++--- .../agda/functional-linear-algebra/default.nix | 2 +- .../libraries/agda/iowa-stdlib/default.nix | 8 ++--- .../libraries/agda/standard-library/default.nix | 8 ++--- pkgs/development/libraries/agg/default.nix | 6 ++-- pkgs/development/libraries/alembic/default.nix | 4 +-- pkgs/development/libraries/allegro/5.nix | 4 +-- pkgs/development/libraries/allegro/default.nix | 4 +-- pkgs/development/libraries/alure/default.nix | 4 +-- pkgs/development/libraries/alure2/default.nix | 4 +-- pkgs/development/libraries/amdvlk/default.nix | 4 +-- pkgs/development/libraries/aml/default.nix | 4 +-- pkgs/development/libraries/amrnb/default.nix | 4 +-- pkgs/development/libraries/amrwb/default.nix | 4 +-- pkgs/development/libraries/amtk/default.nix | 6 ++-- .../libraries/apache-activemq/default.nix | 6 ++-- .../libraries/appstream-glib/default.nix | 6 ++-- pkgs/development/libraries/appstream/default.nix | 4 +-- pkgs/development/libraries/apr-util/default.nix | 6 ++-- pkgs/development/libraries/apr/default.nix | 12 ++++---- pkgs/development/libraries/aqbanking/default.nix | 4 +-- .../development/libraries/aqbanking/gwenhywfar.nix | 8 ++--- .../libraries/aqbanking/libchipcard.nix | 4 +-- pkgs/development/libraries/aravis/default.nix | 36 +++++++++++----------- pkgs/development/libraries/arb/default.nix | 8 ++--- .../libraries/argp-standalone/default.nix | 12 ++++---- pkgs/development/libraries/argtable/default.nix | 4 +-- pkgs/development/libraries/arguments/default.nix | 4 +-- pkgs/development/libraries/aribb25/default.nix | 2 +- pkgs/development/libraries/armadillo/default.nix | 4 +-- pkgs/development/libraries/arrayfire/default.nix | 14 ++++----- pkgs/development/libraries/asio/generic.nix | 6 ++-- pkgs/development/libraries/aspell/default.nix | 8 ++--- pkgs/development/libraries/aspell/dictionaries.nix | 2 +- pkgs/development/libraries/assimp/default.nix | 4 +-- pkgs/development/libraries/at-spi2-atk/default.nix | 6 ++-- .../development/libraries/at-spi2-core/default.nix | 8 ++--- pkgs/development/libraries/atk/default.nix | 12 ++++---- pkgs/development/libraries/atkmm/default.nix | 8 ++--- pkgs/development/libraries/attr/default.nix | 4 +-- pkgs/development/libraries/aubio/default.nix | 4 +-- pkgs/development/libraries/audiality2/default.nix | 4 +-- .../libraries/audio/libbass/default.nix | 6 ++-- .../libraries/audio/libbs2b/default.nix | 6 ++-- .../development/libraries/audio/libgme/default.nix | 6 ++-- .../libraries/audio/libinstpatch/default.nix | 4 +-- .../libraries/audio/libmysofa/default.nix | 4 +-- .../development/libraries/audio/libsmf/default.nix | 4 +-- pkgs/development/libraries/audio/lilv/default.nix | 4 +-- pkgs/development/libraries/audio/lv2/default.nix | 6 ++-- pkgs/development/libraries/audio/lvtk/default.nix | 4 +-- .../development/libraries/audio/mbelib/default.nix | 4 +-- pkgs/development/libraries/audio/ntk/default.nix | 8 ++--- .../development/libraries/audio/qm-dsp/default.nix | 4 +-- pkgs/development/libraries/audio/raul/default.nix | 4 +-- .../libraries/audio/rtaudio/default.nix | 4 +-- .../development/libraries/audio/rtmidi/default.nix | 8 ++--- .../development/libraries/audio/sratom/default.nix | 4 +-- pkgs/development/libraries/audio/suil/default.nix | 2 +- .../libraries/audio/vamp-plugin-sdk/default.nix | 4 +-- .../libraries/audio/zita-alsa-pcmi/default.nix | 8 ++--- .../libraries/audio/zita-convolver/default.nix | 10 +++--- .../libraries/audio/zita-resampler/default.nix | 8 ++--- pkgs/development/libraries/audiofile/default.nix | 6 ++-- pkgs/development/libraries/avahi/default.nix | 26 ++++++++-------- pkgs/development/libraries/avro-c++/default.nix | 8 ++--- pkgs/development/libraries/avro-c/default.nix | 4 +-- pkgs/development/libraries/ayatana-ido/default.nix | 4 +-- pkgs/development/libraries/babl/default.nix | 6 ++-- pkgs/development/libraries/bamf/default.nix | 4 +-- pkgs/development/libraries/bcg729/default.nix | 4 +-- pkgs/development/libraries/bctoolbox/default.nix | 4 +-- pkgs/development/libraries/beecrypt/default.nix | 6 ++-- pkgs/development/libraries/beignet/default.nix | 4 +-- pkgs/development/libraries/belcard/default.nix | 4 +-- pkgs/development/libraries/belle-sip/default.nix | 4 +-- pkgs/development/libraries/belr/default.nix | 4 +-- pkgs/development/libraries/biblesync/default.nix | 6 ++-- pkgs/development/libraries/bobcat/default.nix | 4 +-- pkgs/development/libraries/boehm-gc/7.6.6.nix | 4 +-- pkgs/development/libraries/boehm-gc/default.nix | 4 +-- pkgs/development/libraries/boolstuff/default.nix | 6 ++-- .../libraries/boost-process/default.nix | 4 +-- pkgs/development/libraries/boost/1.67.nix | 4 +-- pkgs/development/libraries/boost/generic.nix | 8 ++--- pkgs/development/libraries/bootil/default.nix | 8 ++--- pkgs/development/libraries/boringssl/default.nix | 4 +-- pkgs/development/libraries/botan/generic.nix | 6 ++-- pkgs/development/libraries/box2d/default.nix | 4 +-- pkgs/development/libraries/boxfort/default.nix | 4 +-- pkgs/development/libraries/brigand/default.nix | 4 +-- pkgs/development/libraries/buddy/default.nix | 6 ++-- pkgs/development/libraries/bullet/default.nix | 14 ++++----- .../libraries/bullet/roboschool-fork.nix | 12 ++++---- pkgs/development/libraries/bulletml/default.nix | 4 +-- pkgs/development/libraries/bwidget/default.nix | 6 ++-- pkgs/development/libraries/bzrtp/default.nix | 4 +-- pkgs/development/libraries/c-ares/default.nix | 6 ++-- pkgs/development/libraries/c-blosc/default.nix | 4 +-- pkgs/development/libraries/caf/default.nix | 4 +-- pkgs/development/libraries/cairo/default.nix | 14 ++++----- pkgs/development/libraries/cairomm/default.nix | 8 ++--- pkgs/development/libraries/capnproto/default.nix | 4 +-- pkgs/development/libraries/capstone/default.nix | 12 ++++---- pkgs/development/libraries/catch/default.nix | 4 +-- pkgs/development/libraries/catch2/default.nix | 4 +-- pkgs/development/libraries/ccrtp/default.nix | 8 ++--- pkgs/development/libraries/cctz/default.nix | 8 ++--- pkgs/development/libraries/cddlib/default.nix | 4 +-- pkgs/development/libraries/cdk/default.nix | 4 +-- pkgs/development/libraries/cdo/default.nix | 10 +++--- pkgs/development/libraries/cegui/default.nix | 4 +-- pkgs/development/libraries/celt/generic.nix | 6 ++-- pkgs/development/libraries/cereal/default.nix | 4 +-- .../development/libraries/ceres-solver/default.nix | 6 ++-- pkgs/development/libraries/cfitsio/default.nix | 6 ++-- pkgs/development/libraries/cgui/default.nix | 4 +-- pkgs/development/libraries/check/default.nix | 6 ++-- pkgs/development/libraries/chipmunk/default.nix | 4 +-- pkgs/development/libraries/chmlib/default.nix | 4 +-- pkgs/development/libraries/chromaprint/default.nix | 2 +- pkgs/development/libraries/cimg/default.nix | 4 +-- pkgs/development/libraries/civetweb/default.nix | 4 +-- pkgs/development/libraries/cl/default.nix | 4 +-- pkgs/development/libraries/classads/default.nix | 6 ++-- pkgs/development/libraries/clearsilver/default.nix | 4 +-- pkgs/development/libraries/clfft/default.nix | 4 +-- pkgs/development/libraries/clipp/default.nix | 4 +-- pkgs/development/libraries/clipper/default.nix | 4 +-- pkgs/development/libraries/cln/default.nix | 4 +-- pkgs/development/libraries/cloog-ppl/default.nix | 6 ++-- pkgs/development/libraries/cloog/0.18.0.nix | 6 ++-- pkgs/development/libraries/cloog/default.nix | 6 ++-- pkgs/development/libraries/clucene-core/2.x.nix | 10 +++--- .../development/libraries/clucene-core/default.nix | 4 +-- pkgs/development/libraries/clutter-gst/default.nix | 10 +++--- pkgs/development/libraries/clutter-gtk/default.nix | 10 +++--- pkgs/development/libraries/clutter/default.nix | 10 +++--- pkgs/development/libraries/cm256cc/default.nix | 4 +-- pkgs/development/libraries/cmark-gfm/default.nix | 4 +-- pkgs/development/libraries/cmark/default.nix | 4 +-- pkgs/development/libraries/cminpack/default.nix | 6 ++-- pkgs/development/libraries/cmocka/default.nix | 4 +-- pkgs/development/libraries/cmrt/default.nix | 4 +-- pkgs/development/libraries/codec2/default.nix | 4 +-- pkgs/development/libraries/cogl/default.nix | 16 +++++----- pkgs/development/libraries/coin3d/default.nix | 4 +-- pkgs/development/libraries/comedilib/default.nix | 6 ++-- .../libraries/concurrencykit/default.nix | 4 +-- pkgs/development/libraries/cpp-hocon/default.nix | 4 +-- .../development/libraries/cpp-ipfs-api/default.nix | 4 +-- pkgs/development/libraries/cpp-netlib/default.nix | 4 +-- .../libraries/cpp-utilities/default.nix | 4 +-- pkgs/development/libraries/cppcms/default.nix | 4 +-- pkgs/development/libraries/cppdb/default.nix | 4 +-- pkgs/development/libraries/cpptest/default.nix | 6 ++-- pkgs/development/libraries/cppunit/default.nix | 4 +-- pkgs/development/libraries/cpputest/default.nix | 8 ++--- pkgs/development/libraries/cppzmq/default.nix | 4 +-- pkgs/development/libraries/cracklib/default.nix | 2 +- pkgs/development/libraries/crc32c/default.nix | 4 +-- pkgs/development/libraries/crcpp/default.nix | 4 +-- pkgs/development/libraries/cre2/default.nix | 4 +-- pkgs/development/libraries/criterion/default.nix | 4 +-- pkgs/development/libraries/crypto++/default.nix | 4 +-- pkgs/development/libraries/csfml/default.nix | 4 +-- pkgs/development/libraries/ctl/default.nix | 4 +-- pkgs/development/libraries/ctpl/default.nix | 4 +-- pkgs/development/libraries/ctpp2/default.nix | 4 +-- pkgs/development/libraries/ctypes_sh/default.nix | 4 +-- pkgs/development/libraries/cudd/default.nix | 4 +-- pkgs/development/libraries/curlcpp/default.nix | 4 +-- pkgs/development/libraries/curlpp/default.nix | 4 +-- pkgs/development/libraries/cutee/default.nix | 4 +-- pkgs/development/libraries/cwiid/default.nix | 4 +-- .../libraries/cxx-prettyprint/default.nix | 6 ++-- pkgs/development/libraries/cxxtest/default.nix | 4 +-- pkgs/development/libraries/cxxtools/default.nix | 8 ++--- pkgs/development/libraries/cyrus-sasl/default.nix | 2 +- pkgs/development/libraries/czmq/default.nix | 4 +-- pkgs/development/libraries/dav1d/default.nix | 12 ++++---- pkgs/development/libraries/db/db-4.8.nix | 2 +- pkgs/development/libraries/db/db-5.3.nix | 2 +- pkgs/development/libraries/db/db-6.0.nix | 4 +-- pkgs/development/libraries/db/db-6.2.nix | 4 +-- pkgs/development/libraries/db/generic.nix | 10 +++--- .../libraries/dbus-cplusplus/default.nix | 4 +-- pkgs/development/libraries/dbus-glib/default.nix | 8 ++--- .../dbus-sharp-glib/dbus-sharp-glib-1.0.nix | 4 +-- .../libraries/dbus-sharp-glib/default.nix | 4 +-- .../libraries/dbus-sharp/dbus-sharp-1.0.nix | 4 +-- pkgs/development/libraries/dbus-sharp/default.nix | 4 +-- pkgs/development/libraries/dbus/default.nix | 2 +- pkgs/development/libraries/dbxml/default.nix | 4 +-- pkgs/development/libraries/dclib/default.nix | 4 +-- pkgs/development/libraries/dclxvi/default.nix | 6 ++-- pkgs/development/libraries/dconf/default.nix | 16 +++++----- pkgs/development/libraries/dee/default.nix | 4 +-- pkgs/development/libraries/discord-rpc/default.nix | 8 ++--- .../libraries/dleyna-connector-dbus/default.nix | 4 +-- pkgs/development/libraries/dleyna-core/default.nix | 4 +-- .../libraries/dleyna-renderer/default.nix | 4 +-- .../libraries/dleyna-server/default.nix | 4 +-- pkgs/development/libraries/dlib/default.nix | 2 +- pkgs/development/libraries/docopt_cpp/default.nix | 4 +-- pkgs/development/libraries/doctest/default.nix | 4 +-- pkgs/development/libraries/dotconf/default.nix | 4 +-- .../libraries/double-conversion/default.nix | 2 +- pkgs/development/libraries/dqlite/default.nix | 4 +-- pkgs/development/libraries/draco/default.nix | 4 +-- pkgs/development/libraries/drumstick/default.nix | 4 +-- pkgs/development/libraries/dssi/default.nix | 4 +-- pkgs/development/libraries/duckdb/default.nix | 4 +-- pkgs/development/libraries/dxflib/default.nix | 6 ++-- pkgs/development/libraries/dyncall/default.nix | 4 +-- .../libraries/easyloggingpp/default.nix | 10 +++--- pkgs/development/libraries/eccodes/default.nix | 6 ++-- pkgs/development/libraries/eclib/default.nix | 6 ++-- pkgs/development/libraries/editline/default.nix | 4 +-- pkgs/development/libraries/eigen/2.0.nix | 8 ++--- pkgs/development/libraries/eigen/default.nix | 6 ++-- pkgs/development/libraries/embree/2.x.nix | 4 +-- pkgs/development/libraries/embree/default.nix | 2 +- pkgs/development/libraries/enchant/1.x.nix | 4 +-- pkgs/development/libraries/enchant/2.x.nix | 4 +-- pkgs/development/libraries/enet/default.nix | 8 ++--- pkgs/development/libraries/entt/default.nix | 4 +-- pkgs/development/libraries/epoxy/default.nix | 4 +-- pkgs/development/libraries/ethash/default.nix | 4 +-- pkgs/development/libraries/eventlog/default.nix | 6 ++-- pkgs/development/libraries/exempi/default.nix | 6 ++-- pkgs/development/libraries/exiv2/default.nix | 8 ++--- pkgs/development/libraries/exosip/default.nix | 4 +-- pkgs/development/libraries/expat/default.nix | 4 +-- pkgs/development/libraries/faac/default.nix | 4 +-- pkgs/development/libraries/faad2/default.nix | 4 +-- pkgs/development/libraries/farbfeld/default.nix | 4 +-- pkgs/development/libraries/farstream/default.nix | 4 +-- .../libraries/fast-cpp-csv-parser/default.nix | 4 +-- pkgs/development/libraries/fastjson/default.nix | 4 +-- pkgs/development/libraries/fastpbkdf2/default.nix | 4 +-- pkgs/development/libraries/faudio/default.nix | 4 +-- pkgs/development/libraries/fcgi/default.nix | 4 +-- pkgs/development/libraries/fcppt/default.nix | 4 +-- pkgs/development/libraries/fdk-aac/default.nix | 4 +-- .../development/libraries/fflas-ffpack/default.nix | 8 ++--- pkgs/development/libraries/ffmpeg-full/default.nix | 10 +++--- .../development/libraries/ffmpeg-sixel/default.nix | 4 +-- pkgs/development/libraries/ffmpeg/generic.nix | 6 ++-- .../libraries/ffmpegthumbnailer/default.nix | 4 +-- pkgs/development/libraries/ffms/default.nix | 4 +-- pkgs/development/libraries/fftw/default.nix | 2 +- .../development/libraries/filter-audio/default.nix | 4 +-- pkgs/development/libraries/flann/default.nix | 8 ++--- pkgs/development/libraries/flatbuffers/default.nix | 6 ++-- pkgs/development/libraries/flatcc/default.nix | 4 +-- pkgs/development/libraries/flatpak/default.nix | 6 ++-- pkgs/development/libraries/flint/default.nix | 12 ++++---- pkgs/development/libraries/flite/default.nix | 8 ++--- pkgs/development/libraries/fltk/1.4.nix | 8 ++--- pkgs/development/libraries/fltk/default.nix | 8 ++--- pkgs/development/libraries/fmt/default.nix | 4 +-- pkgs/development/libraries/folks/default.nix | 10 +++--- pkgs/development/libraries/folly/default.nix | 6 ++-- pkgs/development/libraries/fontconfig/default.nix | 6 ++-- pkgs/development/libraries/forge/default.nix | 4 +-- pkgs/development/libraries/fox/default.nix | 6 ++-- pkgs/development/libraries/fox/fox-1.6.nix | 8 ++--- pkgs/development/libraries/fplll/20160331.nix | 8 ++--- pkgs/development/libraries/fplll/default.nix | 4 +-- pkgs/development/libraries/frame/default.nix | 10 +++--- pkgs/development/libraries/freealut/default.nix | 8 ++--- pkgs/development/libraries/freeglut/default.nix | 6 ++-- pkgs/development/libraries/freetds/default.nix | 6 ++-- pkgs/development/libraries/freetype/default.nix | 6 ++-- pkgs/development/libraries/frei0r/default.nix | 6 ++-- pkgs/development/libraries/fribidi/default.nix | 6 ++-- pkgs/development/libraries/fstrcmp/default.nix | 4 +-- pkgs/development/libraries/fstrm/default.nix | 4 +-- pkgs/development/libraries/ftgl/default.nix | 8 ++--- pkgs/development/libraries/funambol/default.nix | 4 +-- pkgs/development/libraries/galario/default.nix | 14 ++++----- .../libraries/gamenetworkingsockets/default.nix | 4 +-- pkgs/development/libraries/gamin/default.nix | 12 ++++---- pkgs/development/libraries/ganv/default.nix | 4 +-- pkgs/development/libraries/garmintools/default.nix | 6 ++-- pkgs/development/libraries/gbenchmark/default.nix | 4 +-- pkgs/development/libraries/gcab/default.nix | 6 ++-- pkgs/development/libraries/gcc/libstdc++/5.nix | 4 +-- pkgs/development/libraries/gcr/default.nix | 6 ++-- pkgs/development/libraries/gd/default.nix | 6 ++-- pkgs/development/libraries/gdal/2.4.0.nix | 14 ++++----- pkgs/development/libraries/gdal/default.nix | 14 ++++----- pkgs/development/libraries/gdal/gdal-1_11.nix | 8 ++--- pkgs/development/libraries/gdata-sharp/default.nix | 4 +-- pkgs/development/libraries/gdcm/default.nix | 10 +++--- pkgs/development/libraries/gdk-pixbuf/default.nix | 12 ++++---- pkgs/development/libraries/gdk-pixbuf/xlib.nix | 4 +-- pkgs/development/libraries/gdl/default.nix | 6 ++-- pkgs/development/libraries/gdome2/default.nix | 4 +-- pkgs/development/libraries/gecode/3.nix | 4 +-- pkgs/development/libraries/gecode/default.nix | 6 ++-- pkgs/development/libraries/gegl/4.0.nix | 8 ++--- pkgs/development/libraries/gegl/default.nix | 6 ++-- pkgs/development/libraries/geis/default.nix | 4 +-- pkgs/development/libraries/genann/default.nix | 4 +-- pkgs/development/libraries/geoclue/default.nix | 6 ++-- .../development/libraries/geocode-glib/default.nix | 6 ++-- pkgs/development/libraries/geoip/default.nix | 8 ++--- pkgs/development/libraries/geos/default.nix | 6 ++-- pkgs/development/libraries/getdata/default.nix | 4 +-- pkgs/development/libraries/getdns/default.nix | 4 +-- pkgs/development/libraries/gettext/default.nix | 6 ++-- pkgs/development/libraries/gexiv2/default.nix | 6 ++-- pkgs/development/libraries/gfbgraph/default.nix | 6 ++-- pkgs/development/libraries/gflags/default.nix | 4 +-- .../libraries/ggz_base_libs/default.nix | 4 +-- pkgs/development/libraries/giblib/default.nix | 6 ++-- pkgs/development/libraries/giflib/4.1.nix | 4 +-- pkgs/development/libraries/giflib/default.nix | 12 ++++---- pkgs/development/libraries/giflib/libungif.nix | 4 +-- pkgs/development/libraries/gio-sharp/default.nix | 4 +-- pkgs/development/libraries/git2/default.nix | 10 +++--- pkgs/development/libraries/givaro/3.7.nix | 8 ++--- pkgs/development/libraries/givaro/3.nix | 8 ++--- pkgs/development/libraries/givaro/default.nix | 10 +++--- pkgs/development/libraries/gjs/default.nix | 8 ++--- pkgs/development/libraries/gl2ps/default.nix | 4 +-- pkgs/development/libraries/glbinding/default.nix | 4 +-- pkgs/development/libraries/gle/default.nix | 8 ++--- pkgs/development/libraries/glew/1.10.nix | 6 ++-- pkgs/development/libraries/glew/default.nix | 6 ++-- pkgs/development/libraries/glfw/2.x.nix | 6 ++-- pkgs/development/libraries/glfw/3.x.nix | 2 +- .../libraries/glib-networking/default.nix | 6 ++-- .../development/libraries/glib-testing/default.nix | 4 +-- pkgs/development/libraries/glib/default.nix | 8 ++--- pkgs/development/libraries/glibc/default.nix | 20 ++++++------ pkgs/development/libraries/glibc/locales.nix | 6 ++-- pkgs/development/libraries/glibmm/default.nix | 8 ++--- pkgs/development/libraries/glm/default.nix | 8 ++--- .../development/libraries/globalarrays/default.nix | 4 +-- .../libraries/globalplatform/default.nix | 4 +-- .../globalplatform/gppcscconnectionplugin.nix | 4 +-- pkgs/development/libraries/glog/default.nix | 2 +- pkgs/development/libraries/gloox/default.nix | 4 +-- pkgs/development/libraries/glpk/default.nix | 8 ++--- pkgs/development/libraries/glui/default.nix | 4 +-- pkgs/development/libraries/gmime/2.nix | 4 +-- pkgs/development/libraries/gmime/3.nix | 4 +-- pkgs/development/libraries/gmm/default.nix | 4 +-- pkgs/development/libraries/gmp/4.3.2.nix | 10 +++--- pkgs/development/libraries/gmp/5.1.x.nix | 10 +++--- pkgs/development/libraries/gmp/6.x.nix | 10 +++--- pkgs/development/libraries/gmtk/default.nix | 4 +-- pkgs/development/libraries/gnet/default.nix | 4 +-- pkgs/development/libraries/gnome-menus/default.nix | 6 ++-- .../libraries/gnome-online-accounts/default.nix | 4 +-- pkgs/development/libraries/gnome-sharp/default.nix | 2 +- .../libraries/gnome-video-effects/default.nix | 6 ++-- pkgs/development/libraries/gnu-config/default.nix | 4 +-- pkgs/development/libraries/gnu-efi/default.nix | 6 ++-- .../libraries/gobject-introspection/default.nix | 12 ++++---- pkgs/development/libraries/goffice/default.nix | 8 ++--- pkgs/development/libraries/gom/default.nix | 6 ++-- pkgs/development/libraries/goocanvas/2.x.nix | 4 +-- pkgs/development/libraries/goocanvas/default.nix | 8 ++--- pkgs/development/libraries/goocanvasmm/default.nix | 6 ++-- .../libraries/google-cloud-cpp/default.nix | 4 +-- pkgs/development/libraries/gpgme/default.nix | 2 +- pkgs/development/libraries/grail/default.nix | 10 +++--- pkgs/development/libraries/grantlee/default.nix | 4 +-- .../libraries/graphene-hardened-malloc/default.nix | 4 +-- pkgs/development/libraries/graphene/default.nix | 4 +-- pkgs/development/libraries/grib-api/default.nix | 10 +++--- .../libraries/grilo-plugins/default.nix | 8 ++--- pkgs/development/libraries/grilo/default.nix | 6 ++-- pkgs/development/libraries/grpc/default.nix | 8 ++--- pkgs/development/libraries/gsasl/default.nix | 8 ++--- .../gsettings-desktop-schemas/default.nix | 6 ++-- .../development/libraries/gsettings-qt/default.nix | 4 +-- pkgs/development/libraries/gsignond/default.nix | 4 +-- .../libraries/gsignond/plugins/lastfm.nix | 4 +-- .../libraries/gsignond/plugins/mail.nix | 4 +-- .../libraries/gsignond/plugins/oauth.nix | 4 +-- .../libraries/gsignond/plugins/sasl.nix | 4 +-- pkgs/development/libraries/gsl/default.nix | 8 ++--- pkgs/development/libraries/gsl/gsl-1_16.nix | 8 ++--- pkgs/development/libraries/gsm/default.nix | 6 ++-- pkgs/development/libraries/gsmlib/default.nix | 4 +-- pkgs/development/libraries/gsoap/default.nix | 4 +-- pkgs/development/libraries/gsound/default.nix | 6 ++-- pkgs/development/libraries/gspell/default.nix | 6 ++-- pkgs/development/libraries/gss/default.nix | 8 ++--- pkgs/development/libraries/gssdp/default.nix | 6 ++-- .../libraries/gstreamer/bad/default.nix | 6 ++-- .../libraries/gstreamer/devtools/default.nix | 4 +-- .../libraries/gstreamer/ges/default.nix | 4 +-- .../libraries/gstreamer/good/default.nix | 6 ++-- .../libraries/gstreamer/gstreamermm/default.nix | 6 ++-- .../libraries/gstreamer/rtsp-server/default.nix | 4 +-- .../libraries/gstreamer/vaapi/default.nix | 4 +-- pkgs/development/libraries/gtdialog/default.nix | 8 ++--- pkgs/development/libraries/gtest/default.nix | 4 +-- pkgs/development/libraries/gthree/default.nix | 4 +-- .../libraries/gtk-engine-bluecurve/default.nix | 8 ++--- .../libraries/gtk-engine-murrine/default.nix | 8 ++--- pkgs/development/libraries/gtk-engines/default.nix | 6 ++-- .../libraries/gtk-layer-shell/default.nix | 4 +-- .../libraries/gtk-mac-integration/default.nix | 4 +-- .../libraries/gtk-sharp-beans/default.nix | 4 +-- pkgs/development/libraries/gtk-sharp/2.0.nix | 2 +- pkgs/development/libraries/gtk-sharp/3.0.nix | 6 ++-- pkgs/development/libraries/gtk/2.x.nix | 4 +-- pkgs/development/libraries/gtk/3.x.nix | 6 ++-- pkgs/development/libraries/gtkd/default.nix | 4 +-- pkgs/development/libraries/gtkdatabox/default.nix | 6 ++-- .../development/libraries/gtkimageview/default.nix | 6 ++-- pkgs/development/libraries/gtkmathview/default.nix | 6 ++-- pkgs/development/libraries/gtkmm/2.x.nix | 8 ++--- pkgs/development/libraries/gtkmm/3.x.nix | 6 ++-- pkgs/development/libraries/gtksourceview/3.x.nix | 6 ++-- pkgs/development/libraries/gtksourceview/4.x.nix | 6 ++-- pkgs/development/libraries/gtksourceviewmm/4.x.nix | 6 ++-- .../libraries/gtksourceviewmm/default.nix | 6 ++-- pkgs/development/libraries/gtkspell/3.nix | 4 +-- pkgs/development/libraries/gtkspell/default.nix | 4 +-- pkgs/development/libraries/gtkspellmm/default.nix | 4 +-- pkgs/development/libraries/gts/default.nix | 10 +++--- pkgs/development/libraries/gumbo/default.nix | 4 +-- pkgs/development/libraries/gupnp-av/default.nix | 6 ++-- pkgs/development/libraries/gupnp-dlna/default.nix | 6 ++-- pkgs/development/libraries/gupnp-igd/default.nix | 6 ++-- pkgs/development/libraries/gupnp/default.nix | 6 ++-- pkgs/development/libraries/gusb/default.nix | 4 +-- pkgs/development/libraries/gvfs/default.nix | 12 ++++---- pkgs/development/libraries/half/default.nix | 4 +-- pkgs/development/libraries/hamlib/default.nix | 8 ++--- pkgs/development/libraries/harfbuzz/default.nix | 10 +++--- pkgs/development/libraries/hawknl/default.nix | 6 ++-- pkgs/development/libraries/hdf5-blosc/default.nix | 4 +-- pkgs/development/libraries/hidapi/default.nix | 8 ++--- pkgs/development/libraries/highfive/default.nix | 6 ++-- pkgs/development/libraries/hiredis/default.nix | 4 +-- pkgs/development/libraries/hivex/default.nix | 6 ++-- pkgs/development/libraries/hotpatch/default.nix | 4 +-- .../libraries/howard-hinnant-date/default.nix | 4 +-- pkgs/development/libraries/hpx/default.nix | 8 ++--- pkgs/development/libraries/hspell/default.nix | 4 +-- pkgs/development/libraries/htmlcxx/default.nix | 4 +-- pkgs/development/libraries/http-parser/default.nix | 4 +-- pkgs/development/libraries/hunspell/default.nix | 6 ++-- .../libraries/hunspell/dictionaries.nix | 34 ++++++++++---------- pkgs/development/libraries/hwloc/default.nix | 6 ++-- pkgs/development/libraries/hyena/default.nix | 6 ++-- pkgs/development/libraries/hyperscan/default.nix | 8 ++--- pkgs/development/libraries/hyphen/default.nix | 4 +-- pkgs/development/libraries/icu/base.nix | 12 ++++---- pkgs/development/libraries/id3lib/default.nix | 4 +-- pkgs/development/libraries/idnkit/default.nix | 4 +-- pkgs/development/libraries/ijs/default.nix | 4 +-- pkgs/development/libraries/iksemel/default.nix | 4 +-- pkgs/development/libraries/ilbc/default.nix | 4 +-- pkgs/development/libraries/ilixi/default.nix | 4 +-- pkgs/development/libraries/ilmbase/default.nix | 4 +-- pkgs/development/libraries/iml/default.nix | 8 ++--- pkgs/development/libraries/imlib/default.nix | 4 +-- pkgs/development/libraries/imlib2/default.nix | 6 ++-- pkgs/development/libraries/impy/default.nix | 4 +-- pkgs/development/libraries/inchi/default.nix | 4 +-- pkgs/development/libraries/incrtcl/default.nix | 6 ++-- .../libraries/indicator-application/gtk3.nix | 4 +-- pkgs/development/libraries/indilib/default.nix | 4 +-- pkgs/development/libraries/inih/default.nix | 4 +-- pkgs/development/libraries/iniparser/default.nix | 6 ++-- .../development/libraries/intel-gmmlib/default.nix | 4 +-- .../libraries/intel-media-driver/default.nix | 10 +++--- .../libraries/intel-media-sdk/default.nix | 4 +-- .../libraries/ip2location-c/default.nix | 4 +-- pkgs/development/libraries/irrlicht/default.nix | 6 ++-- pkgs/development/libraries/irrlicht/mac.nix | 6 ++-- pkgs/development/libraries/isl/0.11.1.nix | 6 ++-- pkgs/development/libraries/isl/0.14.1.nix | 6 ++-- pkgs/development/libraries/isl/0.17.1.nix | 6 ++-- pkgs/development/libraries/isl/0.20.0.nix | 6 ++-- pkgs/development/libraries/iso-codes/default.nix | 4 +-- pkgs/development/libraries/itk/4.x.nix | 10 +++--- pkgs/development/libraries/itk/default.nix | 8 ++--- pkgs/development/libraries/itktcl/default.nix | 6 ++-- pkgs/development/libraries/jama/default.nix | 4 +-- pkgs/development/libraries/jansson/default.nix | 4 +-- .../libraries/java/commons/bcel/default.nix | 8 ++--- .../libraries/java/commons/bsf/default.nix | 6 ++-- .../libraries/java/commons/compress/default.nix | 8 ++--- .../libraries/java/commons/fileupload/default.nix | 8 ++--- .../libraries/java/commons/io/default.nix | 8 ++--- .../libraries/java/commons/lang/default.nix | 8 ++--- .../libraries/java/commons/logging/default.nix | 6 ++-- .../libraries/java/commons/math/default.nix | 8 ++--- pkgs/development/libraries/java/cup/default.nix | 8 ++--- .../libraries/java/dbus-java/default.nix | 4 +-- .../libraries/java/geoipjava/default.nix | 8 ++--- .../libraries/java/gwt-dragdrop/default.nix | 4 +-- .../libraries/java/gwt-widgets/default.nix | 4 +-- pkgs/development/libraries/java/hsqldb/default.nix | 6 ++-- .../libraries/java/httpunit/default.nix | 4 +-- .../libraries/java/hydra-ant-logger/default.nix | 4 +-- pkgs/development/libraries/java/jdom/default.nix | 4 +-- pkgs/development/libraries/java/jflex/default.nix | 6 ++-- pkgs/development/libraries/java/junit/default.nix | 4 +-- .../libraries/java/junixsocket/default.nix | 8 ++--- .../libraries/java/libmatthew-java/default.nix | 4 +-- pkgs/development/libraries/java/lombok/default.nix | 8 ++--- pkgs/development/libraries/java/lucene/default.nix | 4 +-- .../libraries/java/mockobjects/default.nix | 4 +-- pkgs/development/libraries/java/rhino/default.nix | 4 +-- pkgs/development/libraries/java/saxon/default.nix | 8 ++--- pkgs/development/libraries/java/smack/default.nix | 6 ++-- pkgs/development/libraries/java/swt/default.nix | 2 +- pkgs/development/libraries/jbig2dec/default.nix | 6 ++-- pkgs/development/libraries/jbigkit/default.nix | 8 ++--- pkgs/development/libraries/jcal/default.nix | 4 +-- pkgs/development/libraries/jemalloc/common.nix | 6 ++-- .../libraries/jitterentropy/default.nix | 8 ++--- pkgs/development/libraries/json-c/default.nix | 4 +-- pkgs/development/libraries/json-glib/default.nix | 8 ++--- pkgs/development/libraries/jsoncpp/default.nix | 4 +-- .../development/libraries/jsonrpc-glib/default.nix | 6 ++-- pkgs/development/libraries/judy/default.nix | 8 ++--- pkgs/development/libraries/jxrlib/default.nix | 6 ++-- pkgs/development/libraries/kerberos/heimdal.nix | 4 +-- pkgs/development/libraries/kerberos/krb5.nix | 4 +-- pkgs/development/libraries/keybinder/default.nix | 4 +-- pkgs/development/libraries/keybinder3/default.nix | 4 +-- pkgs/development/libraries/keystone/default.nix | 4 +-- .../libraries/khronos-ocl-icd-loader/default.nix | 6 ++-- pkgs/development/libraries/kissfft/default.nix | 4 +-- pkgs/development/libraries/kmsxx/default.nix | 6 ++-- pkgs/development/libraries/kpmcore/default.nix | 2 +- .../development/libraries/kyotocabinet/default.nix | 6 ++-- pkgs/development/libraries/l-smash/default.nix | 4 +-- pkgs/development/libraries/lame/default.nix | 4 +-- .../libraries/languagemachines/frog.nix | 4 +-- .../libraries/languagemachines/frogdata.nix | 4 +-- .../libraries/languagemachines/libfolia.nix | 4 +-- .../development/libraries/languagemachines/mbt.nix | 4 +-- .../libraries/languagemachines/ticcutils.nix | 4 +-- .../libraries/languagemachines/timbl.nix | 4 +-- .../libraries/languagemachines/timblserver.nix | 4 +-- .../libraries/languagemachines/ucto.nix | 4 +-- .../libraries/languagemachines/uctodata.nix | 4 +-- pkgs/development/libraries/lasem/default.nix | 8 ++--- pkgs/development/libraries/lasso/default.nix | 4 +-- pkgs/development/libraries/lcms/default.nix | 6 ++-- pkgs/development/libraries/lcms2/default.nix | 4 +-- pkgs/development/libraries/ldacbt/default.nix | 4 +-- pkgs/development/libraries/ldb/default.nix | 4 +-- pkgs/development/libraries/ldns/default.nix | 6 ++-- pkgs/development/libraries/leatherman/default.nix | 4 +-- pkgs/development/libraries/lensfun/default.nix | 6 ++-- pkgs/development/libraries/leptonica/default.nix | 6 ++-- pkgs/development/libraries/lesstif/default.nix | 4 +-- pkgs/development/libraries/leveldb/default.nix | 6 ++-- pkgs/development/libraries/levmar/default.nix | 6 ++-- pkgs/development/libraries/lib3ds/default.nix | 4 +-- pkgs/development/libraries/lib3mf/default.nix | 4 +-- .../libraries/libAfterImage/default.nix | 4 +-- pkgs/development/libraries/libHX/default.nix | 4 +-- pkgs/development/libraries/libLAS/default.nix | 12 ++++---- pkgs/development/libraries/libaacs/default.nix | 4 +-- pkgs/development/libraries/libaal/default.nix | 8 ++--- pkgs/development/libraries/libabigail/default.nix | 4 +-- pkgs/development/libraries/libabw/default.nix | 4 +-- .../libraries/libaccounts-glib/default.nix | 4 +-- pkgs/development/libraries/libaec/default.nix | 4 +-- pkgs/development/libraries/libagar/default.nix | 4 +-- .../development/libraries/libagar/libagar_test.nix | 4 +-- pkgs/development/libraries/libamqpcpp/default.nix | 4 +-- pkgs/development/libraries/libantlr3c/default.nix | 6 ++-- pkgs/development/libraries/libao/default.nix | 2 +- pkgs/development/libraries/libaom/default.nix | 4 +-- pkgs/development/libraries/libaosd/default.nix | 4 +-- pkgs/development/libraries/libarchive/default.nix | 18 +++++------ pkgs/development/libraries/libargon2/default.nix | 4 +-- pkgs/development/libraries/libasr/default.nix | 4 +-- pkgs/development/libraries/libass/default.nix | 4 +-- pkgs/development/libraries/libassuan/default.nix | 4 +-- pkgs/development/libraries/libast/default.nix | 4 +-- pkgs/development/libraries/libasyncns/default.nix | 6 ++-- .../libraries/libatomic_ops/default.nix | 12 ++++---- .../development/libraries/libaudclient/default.nix | 4 +-- pkgs/development/libraries/libav/default.nix | 8 ++--- pkgs/development/libraries/libavc1394/default.nix | 6 ++-- pkgs/development/libraries/libavif/default.nix | 4 +-- .../libraries/libayatana-appindicator/default.nix | 2 +- .../libraries/libayatana-indicator/default.nix | 2 +- pkgs/development/libraries/libb2/default.nix | 6 ++-- pkgs/development/libraries/libb64/default.nix | 6 ++-- .../development/libraries/libbacktrace/default.nix | 4 +-- pkgs/development/libraries/libbap/default.nix | 4 +-- pkgs/development/libraries/libbdplus/default.nix | 4 +-- pkgs/development/libraries/libbfd/default.nix | 4 +-- pkgs/development/libraries/libblockdev/default.nix | 6 ++-- .../libraries/libblocksruntime/default.nix | 4 +-- .../development/libraries/libbluedevil/default.nix | 6 ++-- pkgs/development/libraries/libbluray/default.nix | 8 ++--- pkgs/development/libraries/libbsd/default.nix | 4 +-- pkgs/development/libraries/libbson/default.nix | 4 +-- pkgs/development/libraries/libburn/default.nix | 4 +-- pkgs/development/libraries/libbytesize/default.nix | 4 +-- pkgs/development/libraries/libcaca/default.nix | 10 +++--- pkgs/development/libraries/libcacard/default.nix | 4 +-- pkgs/development/libraries/libcanberra/default.nix | 6 ++-- pkgs/development/libraries/libcangjie/default.nix | 8 ++--- pkgs/development/libraries/libcbor/default.nix | 4 +-- pkgs/development/libraries/libcdaudio/default.nix | 6 ++-- pkgs/development/libraries/libcddb/default.nix | 8 ++--- .../libraries/libcdio-paranoia/default.nix | 10 +++--- pkgs/development/libraries/libcdio/default.nix | 6 ++-- pkgs/development/libraries/libcdr/default.nix | 6 ++-- pkgs/development/libraries/libcec/default.nix | 8 ++--- pkgs/development/libraries/libcec/platform.nix | 6 ++-- pkgs/development/libraries/libcef/default.nix | 6 ++-- pkgs/development/libraries/libcello/default.nix | 8 ++--- .../development/libraries/libchamplain/default.nix | 6 ++-- pkgs/development/libraries/libchardet/default.nix | 4 +-- pkgs/development/libraries/libchewing/default.nix | 4 +-- pkgs/development/libraries/libchop/default.nix | 4 +-- pkgs/development/libraries/libck/default.nix | 4 +-- pkgs/development/libraries/libclc/default.nix | 4 +-- pkgs/development/libraries/libcli/default.nix | 4 +-- .../libraries/libcloudproviders/default.nix | 4 +-- .../development/libraries/libclthreads/default.nix | 4 +-- .../development/libraries/libclxclient/default.nix | 4 +-- pkgs/development/libraries/libcmis/default.nix | 4 +-- .../libraries/libco-canonical/default.nix | 4 +-- .../libraries/libcollectdclient/default.nix | 6 ++-- pkgs/development/libraries/libcommuni/default.nix | 4 +-- pkgs/development/libraries/libconfig/default.nix | 4 +-- pkgs/development/libraries/libconfuse/default.nix | 4 +-- .../development/libraries/libcouchbase/default.nix | 4 +-- pkgs/development/libraries/libcrafter/default.nix | 8 ++--- pkgs/development/libraries/libcredis/default.nix | 4 +-- .../development/libraries/libcrossguid/default.nix | 4 +-- pkgs/development/libraries/libcryptui/default.nix | 6 ++-- pkgs/development/libraries/libcsptr/default.nix | 4 +-- pkgs/development/libraries/libctb/default.nix | 4 +-- .../development/libraries/libctemplate/default.nix | 4 +-- pkgs/development/libraries/libcue/default.nix | 4 +-- pkgs/development/libraries/libcutl/default.nix | 4 +-- pkgs/development/libraries/libdaemon/default.nix | 8 ++--- pkgs/development/libraries/libdap/default.nix | 4 +-- pkgs/development/libraries/libdatrie/default.nix | 6 ++-- pkgs/development/libraries/libdazzle/default.nix | 6 ++-- .../libraries/libdbi-drivers/default.nix | 4 +-- pkgs/development/libraries/libdbi/default.nix | 4 +-- .../libraries/libdbusmenu-qt/default.nix | 4 +-- .../libraries/libdbusmenu-qt/qt-5.5.nix | 4 +-- pkgs/development/libraries/libdc1394/default.nix | 8 ++--- pkgs/development/libraries/libde265/default.nix | 8 ++--- pkgs/development/libraries/libdevil/default.nix | 8 ++--- pkgs/development/libraries/libdigidoc/default.nix | 8 ++--- .../development/libraries/libdigidocpp/default.nix | 4 +-- pkgs/development/libraries/libdiscid/default.nix | 8 ++--- .../libraries/libdivecomputer/default.nix | 4 +-- .../libraries/libdivsufsort/default.nix | 6 ++-- pkgs/development/libraries/libdmtx/default.nix | 6 ++-- pkgs/development/libraries/libdnet/default.nix | 8 ++--- pkgs/development/libraries/libdv/default.nix | 6 ++-- pkgs/development/libraries/libdvbpsi/default.nix | 6 ++-- pkgs/development/libraries/libdvdcss/default.nix | 6 ++-- pkgs/development/libraries/libdvdnav/4.2.1.nix | 8 ++--- pkgs/development/libraries/libdvdnav/default.nix | 8 ++--- pkgs/development/libraries/libdvdread/4.9.9.nix | 8 ++--- pkgs/development/libraries/libdvdread/default.nix | 8 ++--- pkgs/development/libraries/libdwarf/default.nix | 6 ++-- pkgs/development/libraries/libdwg/default.nix | 8 ++--- pkgs/development/libraries/libdynd/default.nix | 4 +-- pkgs/development/libraries/libe-book/default.nix | 8 ++--- .../development/libraries/libe57format/default.nix | 4 +-- .../development/libraries/libeatmydata/default.nix | 6 ++-- pkgs/development/libraries/libeb/default.nix | 4 +-- pkgs/development/libraries/libebml/default.nix | 4 +-- pkgs/development/libraries/libebur128/default.nix | 4 +-- pkgs/development/libraries/libechonest/default.nix | 6 ++-- pkgs/development/libraries/libedit/default.nix | 4 +-- pkgs/development/libraries/libee/default.nix | 6 ++-- .../libraries/libelf-freebsd/default.nix | 6 ++-- pkgs/development/libraries/libelf/default.nix | 12 ++++---- pkgs/development/libraries/libelfin/default.nix | 4 +-- pkgs/development/libraries/libepc/default.nix | 6 ++-- pkgs/development/libraries/liberfa/default.nix | 4 +-- pkgs/development/libraries/liberio/default.nix | 4 +-- pkgs/development/libraries/libesmtp/default.nix | 4 +-- pkgs/development/libraries/libestr/default.nix | 4 +-- pkgs/development/libraries/libev/default.nix | 10 +++--- pkgs/development/libraries/libevdev/default.nix | 4 +-- .../development/libraries/libevdevplus/default.nix | 4 +-- pkgs/development/libraries/libevent/default.nix | 16 +++++----- pkgs/development/libraries/libewf/default.nix | 8 ++--- pkgs/development/libraries/libexecinfo/default.nix | 12 ++++---- pkgs/development/libraries/libexif/default.nix | 4 +-- .../development/libraries/libextractor/default.nix | 16 +++++----- .../libraries/libexttextcat/default.nix | 4 +-- pkgs/development/libraries/libf2c/default.nix | 6 ++-- pkgs/development/libraries/libfakekey/default.nix | 4 +-- pkgs/development/libraries/libfaketime/default.nix | 8 ++--- pkgs/development/libraries/libff/default.nix | 6 ++-- pkgs/development/libraries/libffcall/default.nix | 4 +-- pkgs/development/libraries/libffi/default.nix | 4 +-- pkgs/development/libraries/libfido2/default.nix | 6 ++-- .../development/libraries/libfilezilla/default.nix | 6 ++-- .../development/libraries/libfishsound/default.nix | 4 +-- pkgs/development/libraries/libfixposix/default.nix | 4 +-- pkgs/development/libraries/libfm/default.nix | 6 ++-- pkgs/development/libraries/libfprint/default.nix | 4 +-- pkgs/development/libraries/libfpx/default.nix | 6 ++-- pkgs/development/libraries/libfreefare/default.nix | 6 ++-- pkgs/development/libraries/libfsm/default.nix | 4 +-- pkgs/development/libraries/libftdi/1.x.nix | 10 +++--- pkgs/development/libraries/libfyaml/default.nix | 4 +-- pkgs/development/libraries/libgadu/default.nix | 6 ++-- .../libraries/libgaminggear/default.nix | 6 ++-- pkgs/development/libraries/libgcrypt/1.5.nix | 6 ++-- pkgs/development/libraries/libgcrypt/default.nix | 16 +++++----- pkgs/development/libraries/libgda/default.nix | 10 +++--- pkgs/development/libraries/libgdamm/default.nix | 6 ++-- pkgs/development/libraries/libgdata/default.nix | 6 ++-- pkgs/development/libraries/libgdiplus/default.nix | 10 +++--- pkgs/development/libraries/libgee/default.nix | 6 ++-- pkgs/development/libraries/libgeotiff/default.nix | 8 ++--- pkgs/development/libraries/libgepub/default.nix | 6 ++-- pkgs/development/libraries/libgig/default.nix | 4 +-- .../development/libraries/libgit2-glib/default.nix | 6 ++-- pkgs/development/libraries/libgksu/default.nix | 8 ++--- pkgs/development/libraries/libglvnd/default.nix | 4 +-- .../libraries/libgnome-keyring/default.nix | 6 ++-- pkgs/development/libraries/libgnomekbd/default.nix | 6 ++-- pkgs/development/libraries/libgnurl/default.nix | 4 +-- .../development/libraries/libgpg-error/default.nix | 2 +- pkgs/development/libraries/libgphoto2/default.nix | 8 ++--- pkgs/development/libraries/libgpod/default.nix | 2 +- .../development/libraries/libgringotts/default.nix | 4 +-- pkgs/development/libraries/libgroove/default.nix | 4 +-- pkgs/development/libraries/libgrss/default.nix | 6 ++-- pkgs/development/libraries/libgsf/default.nix | 8 ++--- pkgs/development/libraries/libgssglue/default.nix | 4 +-- pkgs/development/libraries/libgtop/default.nix | 6 ++-- pkgs/development/libraries/libgudev/default.nix | 6 ++-- pkgs/development/libraries/libguestfs/default.nix | 12 ++++---- pkgs/development/libraries/libgumath/default.nix | 4 +-- pkgs/development/libraries/libgweather/default.nix | 6 ++-- pkgs/development/libraries/libgxps/default.nix | 6 ++-- pkgs/development/libraries/libhandy/0.x.nix | 4 +-- pkgs/development/libraries/libhandy/default.nix | 6 ++-- pkgs/development/libraries/libhangul/default.nix | 4 +-- pkgs/development/libraries/libharu/default.nix | 8 ++--- .../development/libraries/libhdhomerun/default.nix | 6 ++-- pkgs/development/libraries/libheif/default.nix | 8 ++--- .../libraries/libhttpseverywhere/default.nix | 6 ++-- pkgs/development/libraries/libiberty/default.nix | 8 ++--- pkgs/development/libraries/libibmad/default.nix | 4 +-- pkgs/development/libraries/libibumad/default.nix | 4 +-- pkgs/development/libraries/libical/default.nix | 2 +- pkgs/development/libraries/libicns/default.nix | 4 +-- pkgs/development/libraries/libid3tag/default.nix | 4 +-- pkgs/development/libraries/libidn/default.nix | 8 ++--- pkgs/development/libraries/libidn2/default.nix | 10 +++--- pkgs/development/libraries/libiec61883/default.nix | 4 +-- pkgs/development/libraries/libieee1284/default.nix | 4 +-- pkgs/development/libraries/libiio/default.nix | 2 +- .../libraries/libimagequant/default.nix | 4 +-- pkgs/development/libraries/libime/default.nix | 4 +-- .../libraries/libimobiledevice/default.nix | 4 +-- pkgs/development/libraries/libinfinity/default.nix | 14 ++++----- .../development/libraries/libinjection/default.nix | 4 +-- pkgs/development/libraries/libinklevel/default.nix | 4 +-- .../libraries/libinotify-kqueue/default.nix | 4 +-- pkgs/development/libraries/libinput/default.nix | 6 ++-- pkgs/development/libraries/libiodbc/default.nix | 8 ++--- pkgs/development/libraries/libipfix/default.nix | 4 +-- pkgs/development/libraries/libipt/default.nix | 4 +-- pkgs/development/libraries/libiptcdata/default.nix | 6 ++-- .../development/libraries/libircclient/default.nix | 4 +-- .../development/libraries/libirecovery/default.nix | 4 +-- pkgs/development/libraries/libiscsi/default.nix | 4 +-- pkgs/development/libraries/libisds/default.nix | 4 +-- pkgs/development/libraries/libisoburn/default.nix | 4 +-- pkgs/development/libraries/libisofs/default.nix | 4 +-- pkgs/development/libraries/libite/default.nix | 4 +-- pkgs/development/libraries/libivykis/default.nix | 4 +-- pkgs/development/libraries/libixp-hg/default.nix | 8 ++--- pkgs/development/libraries/libjcat/default.nix | 4 +-- .../libraries/libjpeg-turbo/default.nix | 6 ++-- pkgs/development/libraries/libjpeg/default.nix | 8 ++--- pkgs/development/libraries/libjreen/default.nix | 6 ++-- .../libraries/libjson-rpc-cpp/default.nix | 6 ++-- pkgs/development/libraries/libjson/default.nix | 4 +-- pkgs/development/libraries/libkate/default.nix | 4 +-- .../development/libraries/libkeyfinder/default.nix | 4 +-- pkgs/development/libraries/libkml/default.nix | 6 ++-- pkgs/development/libraries/libksba/default.nix | 4 +-- pkgs/development/libraries/libksi/default.nix | 4 +-- pkgs/development/libraries/libktorrent/default.nix | 4 +-- pkgs/development/libraries/liblangtag/default.nix | 8 ++--- pkgs/development/libraries/liblastfm/default.nix | 6 ++-- pkgs/development/libraries/liblastfmSF/default.nix | 4 +-- pkgs/development/libraries/liblaxjson/default.nix | 4 +-- pkgs/development/libraries/liblcf/default.nix | 4 +-- pkgs/development/libraries/liblinear/default.nix | 6 ++-- pkgs/development/libraries/liblinphone/default.nix | 4 +-- pkgs/development/libraries/liblo/default.nix | 8 ++--- pkgs/development/libraries/liblockfile/default.nix | 8 ++--- pkgs/development/libraries/liblogging/default.nix | 4 +-- pkgs/development/libraries/liblognorm/default.nix | 4 +-- pkgs/development/libraries/liblouis/default.nix | 4 +-- pkgs/development/libraries/liblqr-1/default.nix | 4 +-- pkgs/development/libraries/liblscp/default.nix | 4 +-- pkgs/development/libraries/libltc/default.nix | 4 +-- pkgs/development/libraries/liblxi/default.nix | 4 +-- pkgs/development/libraries/libmad/default.nix | 6 ++-- pkgs/development/libraries/libmanette/default.nix | 6 ++-- pkgs/development/libraries/libmatchbox/default.nix | 6 ++-- pkgs/development/libraries/libmatheval/default.nix | 8 ++--- pkgs/development/libraries/libmatroska/default.nix | 4 +-- .../development/libraries/libmaxminddb/default.nix | 4 +-- pkgs/development/libraries/libmbim/default.nix | 4 +-- pkgs/development/libraries/libmcrypt/default.nix | 4 +-- pkgs/development/libraries/libmd/default.nix | 4 +-- pkgs/development/libraries/libmediaart/default.nix | 6 ++-- .../development/libraries/libmediainfo/default.nix | 4 +-- .../development/libraries/libmemcached/default.nix | 10 +++--- pkgs/development/libraries/libmesode/default.nix | 4 +-- pkgs/development/libraries/libmhash/default.nix | 4 +-- pkgs/development/libraries/libmicrodns/default.nix | 4 +-- .../libraries/libmicrohttpd/generic.nix | 4 +-- pkgs/development/libraries/libmikmod/default.nix | 6 ++-- pkgs/development/libraries/libmilter/default.nix | 4 +-- pkgs/development/libraries/libminc/default.nix | 4 +-- pkgs/development/libraries/libmkv/default.nix | 8 ++--- pkgs/development/libraries/libmms/default.nix | 4 +-- pkgs/development/libraries/libmng/default.nix | 4 +-- pkgs/development/libraries/libmnl/default.nix | 6 ++-- pkgs/development/libraries/libmodbus/default.nix | 4 +-- pkgs/development/libraries/libmodplug/default.nix | 4 +-- pkgs/development/libraries/libmodule/default.nix | 4 +-- pkgs/development/libraries/libmodulemd/default.nix | 4 +-- .../libraries/libmongo-client/default.nix | 4 +-- pkgs/development/libraries/libmowgli/default.nix | 4 +-- pkgs/development/libraries/libmp3splt/default.nix | 4 +-- pkgs/development/libraries/libmpack/default.nix | 4 +-- pkgs/development/libraries/libmpc/default.nix | 6 ++-- pkgs/development/libraries/libmpcdec/default.nix | 6 ++-- pkgs/development/libraries/libmpeg2/default.nix | 10 +++--- pkgs/development/libraries/libmrss/default.nix | 8 ++--- pkgs/development/libraries/libmspack/default.nix | 6 ++-- pkgs/development/libraries/libmtp/default.nix | 4 +-- pkgs/development/libraries/libmusicbrainz/5.x.nix | 4 +-- .../libraries/libmusicbrainz/default.nix | 4 +-- pkgs/development/libraries/libmwaw/default.nix | 8 ++--- pkgs/development/libraries/libmx/default.nix | 4 +-- pkgs/development/libraries/libmypaint/default.nix | 4 +-- .../libraries/libmysqlconnectorcpp/default.nix | 6 ++-- pkgs/development/libraries/libnabo/default.nix | 4 +-- pkgs/development/libraries/libnatpmp/default.nix | 4 +-- pkgs/development/libraries/libnats-c/default.nix | 4 +-- pkgs/development/libraries/libnatspec/default.nix | 6 ++-- pkgs/development/libraries/libndctl/default.nix | 4 +-- pkgs/development/libraries/libndp/default.nix | 4 +-- pkgs/development/libraries/libndtypes/default.nix | 4 +-- pkgs/development/libraries/libnest2d/default.nix | 4 +-- pkgs/development/libraries/libnet/default.nix | 4 +-- .../libraries/libnetfilter_acct/default.nix | 4 +-- .../libraries/libnetfilter_conntrack/default.nix | 4 +-- .../libraries/libnetfilter_cthelper/default.nix | 6 ++-- .../libraries/libnetfilter_cttimeout/default.nix | 6 ++-- .../libraries/libnetfilter_log/default.nix | 4 +-- .../libraries/libnetfilter_queue/default.nix | 4 +-- pkgs/development/libraries/libnfc/default.nix | 4 +-- .../development/libraries/libnfnetlink/default.nix | 6 ++-- pkgs/development/libraries/libnfs/default.nix | 6 ++-- pkgs/development/libraries/libnftnl/default.nix | 4 +-- pkgs/development/libraries/libngspice/default.nix | 4 +-- pkgs/development/libraries/libnice/default.nix | 4 +-- pkgs/development/libraries/libnih/default.nix | 6 ++-- pkgs/development/libraries/libnixxml/default.nix | 4 +-- pkgs/development/libraries/libnotify/default.nix | 6 ++-- pkgs/development/libraries/libnova/default.nix | 4 +-- pkgs/development/libraries/libnsl/default.nix | 4 +-- pkgs/development/libraries/libnxml/default.nix | 8 ++--- pkgs/development/libraries/liboauth/default.nix | 4 +-- pkgs/development/libraries/libodfgen/default.nix | 8 ++--- pkgs/development/libraries/libofa/default.nix | 4 +-- pkgs/development/libraries/libofx/default.nix | 6 ++-- pkgs/development/libraries/libogg/default.nix | 6 ++-- pkgs/development/libraries/liboggz/default.nix | 4 +-- pkgs/development/libraries/liboil/default.nix | 8 ++--- .../libraries/libomxil-bellagio/default.nix | 6 ++-- pkgs/development/libraries/liboop/default.nix | 4 +-- pkgs/development/libraries/libopcodes/default.nix | 4 +-- pkgs/development/libraries/libopenaptx/default.nix | 4 +-- pkgs/development/libraries/liboping/default.nix | 4 +-- pkgs/development/libraries/libopus/default.nix | 10 +++--- pkgs/development/libraries/libopusenc/default.nix | 4 +-- pkgs/development/libraries/libosinfo/default.nix | 4 +-- pkgs/development/libraries/libosmium/default.nix | 4 +-- pkgs/development/libraries/libosmpbf/default.nix | 6 ++-- .../development/libraries/libossp-uuid/default.nix | 6 ++-- pkgs/development/libraries/libotr/default.nix | 4 +-- pkgs/development/libraries/libow/default.nix | 4 +-- pkgs/development/libraries/libowfat/default.nix | 4 +-- pkgs/development/libraries/libp11/default.nix | 4 +-- .../libraries/libpam-wrapper/default.nix | 6 ++-- pkgs/development/libraries/libpaper/default.nix | 6 ++-- pkgs/development/libraries/libpar2/default.nix | 8 ++--- pkgs/development/libraries/libpcap/default.nix | 4 +-- pkgs/development/libraries/libpeas/default.nix | 6 ++-- pkgs/development/libraries/libpfm/default.nix | 6 ++-- pkgs/development/libraries/libpgf/default.nix | 8 ++--- .../libraries/libphonenumber/default.nix | 4 +-- pkgs/development/libraries/libpinyin/default.nix | 4 +-- pkgs/development/libraries/libpipeline/default.nix | 6 ++-- pkgs/development/libraries/libplacebo/default.nix | 4 +-- pkgs/development/libraries/libplist/default.nix | 12 ++++---- pkgs/development/libraries/libpng/12.nix | 4 +-- pkgs/development/libraries/libpng/default.nix | 6 ++-- .../libraries/libpointmatcher/default.nix | 4 +-- pkgs/development/libraries/libportal/default.nix | 4 +-- pkgs/development/libraries/libproxy/default.nix | 8 ++--- pkgs/development/libraries/libpseudo/default.nix | 4 +-- pkgs/development/libraries/libpsl/default.nix | 8 ++--- pkgs/development/libraries/libpst/default.nix | 4 +-- .../development/libraries/libqalculate/default.nix | 6 ++-- pkgs/development/libraries/libqb/default.nix | 4 +-- .../development/libraries/libqglviewer/default.nix | 6 ++-- pkgs/development/libraries/libqmi/default.nix | 4 +-- pkgs/development/libraries/libr3/default.nix | 4 +-- .../libraries/libraspberrypi/default.nix | 4 +-- pkgs/development/libraries/libraw/default.nix | 4 +-- pkgs/development/libraries/libraw1394/default.nix | 4 +-- pkgs/development/libraries/librdf/raptor.nix | 8 ++--- pkgs/development/libraries/librdf/raptor2.nix | 8 ++--- pkgs/development/libraries/librdf/rasqal.nix | 8 ++--- pkgs/development/libraries/librdf/redland.nix | 14 ++++----- pkgs/development/libraries/libre/default.nix | 12 ++++---- .../development/libraries/librealsense/default.nix | 2 +- pkgs/development/libraries/librelp/default.nix | 4 +-- pkgs/development/libraries/librem/default.nix | 12 ++++---- pkgs/development/libraries/librep/default.nix | 4 +-- pkgs/development/libraries/libresample/default.nix | 8 ++--- pkgs/development/libraries/librest/default.nix | 6 ++-- pkgs/development/libraries/librevenge/default.nix | 8 ++--- pkgs/development/libraries/librevisa/default.nix | 4 +-- pkgs/development/libraries/librime/default.nix | 4 +-- pkgs/development/libraries/libroxml/default.nix | 4 +-- pkgs/development/libraries/librseq/default.nix | 4 +-- pkgs/development/libraries/librsvg/default.nix | 8 ++--- pkgs/development/libraries/librsync/0.9.nix | 10 +++--- pkgs/development/libraries/librsync/default.nix | 4 +-- .../development/libraries/librtprocess/default.nix | 4 +-- pkgs/development/libraries/libs3/default.nix | 4 +-- .../libraries/libsamplerate/default.nix | 6 ++-- pkgs/development/libraries/libsass/default.nix | 4 +-- pkgs/development/libraries/libschrift/default.nix | 4 +-- pkgs/development/libraries/libscrypt/default.nix | 8 ++--- pkgs/development/libraries/libsearpc/default.nix | 4 +-- pkgs/development/libraries/libseccomp/default.nix | 4 +-- pkgs/development/libraries/libsecret/default.nix | 6 ++-- .../libraries/libserialport/default.nix | 8 ++--- pkgs/development/libraries/libshout/default.nix | 8 ++--- pkgs/development/libraries/libsieve/default.nix | 4 +-- pkgs/development/libraries/libsigcxx/1.2.nix | 4 +-- pkgs/development/libraries/libsigcxx/default.nix | 6 ++-- .../libraries/libsignal-protocol-c/default.nix | 4 +-- .../libraries/libsignon-glib/default.nix | 4 +-- pkgs/development/libraries/libsigsegv/default.nix | 6 ++-- pkgs/development/libraries/libsixel/default.nix | 4 +-- pkgs/development/libraries/libskk/default.nix | 8 ++--- pkgs/development/libraries/libslirp/default.nix | 4 +-- .../development/libraries/libsmartcols/default.nix | 8 ++--- pkgs/development/libraries/libsmi/default.nix | 6 ++-- pkgs/development/libraries/libsnark/default.nix | 6 ++-- pkgs/development/libraries/libsndfile/default.nix | 8 ++--- pkgs/development/libraries/libsodium/default.nix | 4 +-- pkgs/development/libraries/libsolv/default.nix | 4 +-- pkgs/development/libraries/libsoundio/default.nix | 10 +++--- pkgs/development/libraries/libsoup/default.nix | 4 +-- .../libraries/libspatialindex/default.nix | 6 ++-- pkgs/development/libraries/libspectre/default.nix | 6 ++-- pkgs/development/libraries/libspf2/default.nix | 4 +-- pkgs/development/libraries/libspiro/default.nix | 4 +-- pkgs/development/libraries/libspotify/default.nix | 14 ++++----- pkgs/development/libraries/libsrs2/default.nix | 2 +- pkgs/development/libraries/libssh/default.nix | 4 +-- pkgs/development/libraries/libssh2/default.nix | 6 ++-- pkgs/development/libraries/libstatgrab/default.nix | 6 ++-- pkgs/development/libraries/libstroke/default.nix | 6 ++-- pkgs/development/libraries/libstrophe/default.nix | 4 +-- pkgs/development/libraries/libsurvive/default.nix | 4 +-- pkgs/development/libraries/libsvm/default.nix | 6 ++-- .../development/libraries/libsystemtap/default.nix | 6 ++-- pkgs/development/libraries/libtap/default.nix | 6 ++-- pkgs/development/libraries/libtar/default.nix | 4 +-- pkgs/development/libraries/libtasn1/default.nix | 4 +-- pkgs/development/libraries/libtcod/default.nix | 8 ++--- pkgs/development/libraries/libtelnet/default.nix | 8 ++--- pkgs/development/libraries/libtermkey/default.nix | 2 +- pkgs/development/libraries/libthai/default.nix | 4 +-- pkgs/development/libraries/libtheora/default.nix | 6 ++-- pkgs/development/libraries/libthreadar/default.nix | 4 +-- pkgs/development/libraries/libtiff/default.nix | 4 +-- pkgs/development/libraries/libtins/default.nix | 8 ++--- pkgs/development/libraries/libtomcrypt/default.nix | 4 +-- pkgs/development/libraries/libtommath/default.nix | 4 +-- .../libraries/libtorrent-rasterbar/1.1.nix | 2 +- .../libraries/libtorrent-rasterbar/1.2.nix | 6 ++-- .../libraries/libtorrent-rasterbar/default.nix | 6 ++-- pkgs/development/libraries/libtoxcore/default.nix | 6 ++-- pkgs/development/libraries/libtoxcore/new-api.nix | 8 ++--- pkgs/development/libraries/libtsm/default.nix | 4 +-- pkgs/development/libraries/libu2f-host/default.nix | 4 +-- .../libraries/libu2f-server/default.nix | 4 +-- pkgs/development/libraries/libuchardet/default.nix | 4 +-- pkgs/development/libraries/libucl/default.nix | 8 ++--- pkgs/development/libraries/libuecc/default.nix | 4 +-- pkgs/development/libraries/libui/default.nix | 16 +++++----- .../libraries/libuinputplus/default.nix | 4 +-- pkgs/development/libraries/libunarr/default.nix | 4 +-- pkgs/development/libraries/libunibreak/default.nix | 6 ++-- .../libraries/libuninameslist/default.nix | 4 +-- pkgs/development/libraries/libunique/3.x.nix | 6 ++-- pkgs/development/libraries/libunique/default.nix | 8 ++--- .../development/libraries/libunistring/default.nix | 8 ++--- pkgs/development/libraries/libunity/default.nix | 4 +-- pkgs/development/libraries/libunwind/default.nix | 2 +- pkgs/development/libraries/liburcu/default.nix | 4 +-- pkgs/development/libraries/liburing/default.nix | 4 +-- pkgs/development/libraries/libusb-compat/0.1.nix | 4 +-- pkgs/development/libraries/libusb1/default.nix | 14 ++++----- pkgs/development/libraries/libusbmuxd/default.nix | 4 +-- pkgs/development/libraries/libuv/default.nix | 6 ++-- pkgs/development/libraries/libuvc/default.nix | 4 +-- pkgs/development/libraries/libva/1.0.0.nix | 2 +- pkgs/development/libraries/libva/default.nix | 2 +- pkgs/development/libraries/libva/utils.nix | 4 +-- .../libraries/libvdpau-va-gl/default.nix | 4 +-- pkgs/development/libraries/libvdpau/default.nix | 8 ++--- pkgs/development/libraries/libversion/default.nix | 2 +- pkgs/development/libraries/libviper/default.nix | 4 +-- .../development/libraries/libvirt-glib/default.nix | 4 +-- pkgs/development/libraries/libvirt/5.9.0.nix | 6 ++-- pkgs/development/libraries/libvirt/default.nix | 8 ++--- pkgs/development/libraries/libvisio/default.nix | 4 +-- pkgs/development/libraries/libvisual/default.nix | 8 ++--- pkgs/development/libraries/libvmaf/default.nix | 4 +-- pkgs/development/libraries/libvmi/default.nix | 6 ++-- .../development/libraries/libvncserver/default.nix | 10 +++--- pkgs/development/libraries/libvorbis/default.nix | 4 +-- pkgs/development/libraries/libvpx/1_8.nix | 6 ++-- pkgs/development/libraries/libvpx/default.nix | 6 ++-- .../libraries/libvterm-neovim/default.nix | 6 ++-- pkgs/development/libraries/libvterm/default.nix | 4 +-- pkgs/development/libraries/libwacom/default.nix | 4 +-- pkgs/development/libraries/libwebp/default.nix | 4 +-- .../libraries/libwebsockets/default.nix | 6 ++-- pkgs/development/libraries/libwhereami/default.nix | 4 +-- pkgs/development/libraries/libwmf/default.nix | 4 +-- pkgs/development/libraries/libwnck/3.x.nix | 8 ++--- pkgs/development/libraries/libwnck/default.nix | 8 ++--- pkgs/development/libraries/libwpd/0.8.nix | 4 +-- pkgs/development/libraries/libwpd/default.nix | 4 +-- pkgs/development/libraries/libwpg/default.nix | 4 +-- pkgs/development/libraries/libwps/default.nix | 4 +-- pkgs/development/libraries/libx86/default.nix | 6 ++-- pkgs/development/libraries/libx86emu/default.nix | 4 +-- pkgs/development/libraries/libxc/default.nix | 4 +-- pkgs/development/libraries/libxcomp/default.nix | 4 +-- .../libraries/libxdg-basedir/default.nix | 4 +-- .../development/libraries/libxkbcommon/default.nix | 4 +-- .../libraries/libxkbcommon/libxkbcommon_7.nix | 6 ++-- pkgs/development/libraries/libxklavier/default.nix | 4 +-- pkgs/development/libraries/libxl/default.nix | 4 +-- pkgs/development/libraries/libxls/default.nix | 4 +-- pkgs/development/libraries/libxmi/default.nix | 6 ++-- pkgs/development/libraries/libxmlb/default.nix | 4 +-- pkgs/development/libraries/libxmlxx/default.nix | 6 ++-- pkgs/development/libraries/libxmlxx/v3.nix | 6 ++-- pkgs/development/libraries/libxmp/default.nix | 4 +-- pkgs/development/libraries/libxslt/default.nix | 18 +++++------ pkgs/development/libraries/libxsmm/default.nix | 6 ++-- pkgs/development/libraries/libyaml-cpp/default.nix | 4 +-- pkgs/development/libraries/libyaml/default.nix | 4 +-- pkgs/development/libraries/libykclient/default.nix | 4 +-- pkgs/development/libraries/libykneomgr/default.nix | 4 +-- pkgs/development/libraries/libyubikey/default.nix | 4 +-- pkgs/development/libraries/libzapojit/default.nix | 6 ++-- pkgs/development/libraries/libzdb/default.nix | 6 ++-- pkgs/development/libraries/libzen/default.nix | 4 +-- pkgs/development/libraries/libzip/default.nix | 4 +-- pkgs/development/libraries/libzmf/default.nix | 8 ++--- pkgs/development/libraries/libzra/default.nix | 4 +-- pkgs/development/libraries/lief/default.nix | 4 +-- pkgs/development/libraries/lightning/default.nix | 6 ++-- pkgs/development/libraries/lime/default.nix | 4 +-- pkgs/development/libraries/linbox/default.nix | 8 ++--- .../development/libraries/linenoise-ng/default.nix | 8 ++--- pkgs/development/libraries/linenoise/default.nix | 8 ++--- pkgs/development/libraries/liquid-dsp/default.nix | 6 ++-- pkgs/development/libraries/liquidfun/default.nix | 8 ++--- pkgs/development/libraries/lirc/default.nix | 4 +-- pkgs/development/libraries/live555/default.nix | 2 +- pkgs/development/libraries/lmdb/default.nix | 6 ++-- pkgs/development/libraries/lmdbxx/default.nix | 6 ++-- pkgs/development/libraries/log4cplus/default.nix | 6 ++-- pkgs/development/libraries/log4cpp/default.nix | 4 +-- pkgs/development/libraries/log4cxx/default.nix | 8 ++--- pkgs/development/libraries/log4shib/default.nix | 4 +-- pkgs/development/libraries/loki/default.nix | 4 +-- pkgs/development/libraries/loudmouth/default.nix | 4 +-- pkgs/development/libraries/lrdf/default.nix | 10 +++--- pkgs/development/libraries/luabind/default.nix | 6 ++-- pkgs/development/libraries/lucene++/default.nix | 6 ++-- pkgs/development/libraries/lyra/default.nix | 4 +-- pkgs/development/libraries/lzo/default.nix | 4 +-- pkgs/development/libraries/mac/default.nix | 4 +-- pkgs/development/libraries/malcontent/default.nix | 4 +-- pkgs/development/libraries/malcontent/ui.nix | 4 +-- pkgs/development/libraries/mapnik/default.nix | 4 +-- pkgs/development/libraries/marisa/default.nix | 4 +-- pkgs/development/libraries/marl/default.nix | 4 +-- pkgs/development/libraries/martyr/default.nix | 4 +-- pkgs/development/libraries/matio/default.nix | 4 +-- pkgs/development/libraries/mbedtls/default.nix | 6 ++-- pkgs/development/libraries/mdds/default.nix | 6 ++-- pkgs/development/libraries/medfile/default.nix | 4 +-- .../libraries/mediastreamer/default.nix | 4 +-- .../libraries/mediastreamer/msopenh264.nix | 4 +-- pkgs/development/libraries/menu-cache/default.nix | 4 +-- pkgs/development/libraries/mesa-glu/default.nix | 8 ++--- pkgs/development/libraries/mesa/default.nix | 4 +-- pkgs/development/libraries/metal/default.nix | 4 +-- .../libraries/microsoft_gsl/default.nix | 4 +-- pkgs/development/libraries/mimalloc/default.nix | 8 ++--- pkgs/development/libraries/mimetic/default.nix | 6 ++-- pkgs/development/libraries/miniball/default.nix | 8 ++--- pkgs/development/libraries/minixml/default.nix | 4 +-- pkgs/development/libraries/minizip/default.nix | 4 +-- pkgs/development/libraries/minizip2/default.nix | 4 +-- pkgs/development/libraries/mlt/default.nix | 4 +-- pkgs/development/libraries/mlt/qt-5.nix | 6 ++-- pkgs/development/libraries/mm-common/default.nix | 6 ++-- pkgs/development/libraries/mongoc/default.nix | 4 +-- pkgs/development/libraries/mono-addins/default.nix | 4 +-- pkgs/development/libraries/motif/default.nix | 6 ++-- pkgs/development/libraries/movit/default.nix | 4 +-- pkgs/development/libraries/mp4v2/default.nix | 2 +- pkgs/development/libraries/mpfi/default.nix | 8 ++--- pkgs/development/libraries/mpfr/default.nix | 10 +++--- pkgs/development/libraries/mpich/default.nix | 6 ++-- pkgs/development/libraries/mpir/default.nix | 8 ++--- pkgs/development/libraries/mps/default.nix | 8 ++--- pkgs/development/libraries/msgpack/generic.nix | 6 ++-- pkgs/development/libraries/msgpuck/default.nix | 4 +-- pkgs/development/libraries/msilbc/default.nix | 4 +-- pkgs/development/libraries/mtdev/default.nix | 4 +-- pkgs/development/libraries/mtxclient/default.nix | 4 +-- .../libraries/multipart-parser-c/default.nix | 4 +-- pkgs/development/libraries/muparser/default.nix | 10 +++--- pkgs/development/libraries/muparserx/default.nix | 4 +-- pkgs/development/libraries/mutest/default.nix | 4 +-- pkgs/development/libraries/mygui/default.nix | 4 +-- pkgs/development/libraries/mypaint-brushes/1.0.nix | 4 +-- .../libraries/mypaint-brushes/default.nix | 4 +-- pkgs/development/libraries/mysocketw/default.nix | 8 ++--- pkgs/development/libraries/mythes/default.nix | 4 +-- pkgs/development/libraries/nanoflann/default.nix | 6 ++-- pkgs/development/libraries/nanomsg/default.nix | 4 +-- pkgs/development/libraries/nco/default.nix | 8 ++--- pkgs/development/libraries/ndi/default.nix | 4 +-- pkgs/development/libraries/ndn-cxx/default.nix | 4 +-- pkgs/development/libraries/ndpi/default.nix | 4 +-- pkgs/development/libraries/neardal/default.nix | 4 +-- pkgs/development/libraries/neatvnc/default.nix | 4 +-- pkgs/development/libraries/neon/0.29.nix | 16 +++++----- pkgs/development/libraries/neon/default.nix | 16 +++++----- pkgs/development/libraries/netcdf-cxx4/default.nix | 6 ++-- .../libraries/netcdf-fortran/default.nix | 4 +-- pkgs/development/libraries/netcdf/default.nix | 6 ++-- pkgs/development/libraries/nettle/generic.nix | 8 ++--- .../libraries/networking-ts-cxx/default.nix | 4 +-- pkgs/development/libraries/newt/default.nix | 4 +-- pkgs/development/libraries/nghttp2/default.nix | 8 ++--- pkgs/development/libraries/ngt/default.nix | 4 +-- pkgs/development/libraries/nix-plugins/default.nix | 6 ++-- .../libraries/nlohmann_json/default.nix | 4 +-- pkgs/development/libraries/nlopt/default.nix | 8 ++--- .../development/libraries/notify-sharp/default.nix | 4 +-- pkgs/development/libraries/npapi-sdk/default.nix | 4 +-- pkgs/development/libraries/npth/default.nix | 4 +-- pkgs/development/libraries/nspr/default.nix | 10 +++--- pkgs/development/libraries/nss/3.44.nix | 16 +++++----- pkgs/development/libraries/nss/3.53.nix | 16 +++++----- pkgs/development/libraries/nss/default.nix | 16 +++++----- pkgs/development/libraries/nss_wrapper/default.nix | 4 +-- pkgs/development/libraries/ntbtls/default.nix | 6 ++-- pkgs/development/libraries/ntdb/default.nix | 4 +-- pkgs/development/libraries/ntirpc/default.nix | 4 +-- pkgs/development/libraries/ntrack/default.nix | 4 +-- pkgs/development/libraries/nuraft/default.nix | 4 +-- pkgs/development/libraries/nuspell/default.nix | 4 +-- .../libraries/nv-codec-headers/default.nix | 8 ++--- .../libraries/nvidia-optical-flow-sdk/default.nix | 4 +-- .../libraries/nvidia-texture-tools/default.nix | 4 +-- .../libraries/nvidia-video-sdk/default.nix | 4 +-- pkgs/development/libraries/oatpp/default.nix | 4 +-- pkgs/development/libraries/ocl-icd/default.nix | 4 +-- pkgs/development/libraries/ode/default.nix | 4 +-- pkgs/development/libraries/odpic/default.nix | 14 ++++----- pkgs/development/libraries/ogdf/default.nix | 4 +-- pkgs/development/libraries/ogre/1.10.x.nix | 6 ++-- pkgs/development/libraries/ogre/1.9.x.nix | 6 ++-- pkgs/development/libraries/ogre/default.nix | 6 ++-- pkgs/development/libraries/ogrepaged/default.nix | 6 ++-- pkgs/development/libraries/ois/default.nix | 2 +- pkgs/development/libraries/olm/default.nix | 6 ++-- pkgs/development/libraries/oniguruma/default.nix | 4 +-- pkgs/development/libraries/opae/default.nix | 4 +-- pkgs/development/libraries/openal-soft/default.nix | 4 +-- pkgs/development/libraries/openbabel/2.nix | 2 +- pkgs/development/libraries/openbabel/default.nix | 2 +- pkgs/development/libraries/openbr/default.nix | 8 ++--- .../libraries/opencascade-occt/default.nix | 6 ++-- pkgs/development/libraries/opencascade/default.nix | 4 +-- .../development/libraries/opencl-clang/default.nix | 15 ++++----- .../development/libraries/opencl-clhpp/default.nix | 4 +-- .../libraries/opencl-headers/default.nix | 4 +-- pkgs/development/libraries/opencollada/default.nix | 6 ++-- pkgs/development/libraries/opencolorio/default.nix | 2 +- .../development/libraries/opencore-amr/default.nix | 6 ++-- pkgs/development/libraries/opencsg/default.nix | 14 ++++----- pkgs/development/libraries/openct/default.nix | 4 +-- pkgs/development/libraries/opencv/3.x.nix | 2 +- pkgs/development/libraries/opencv/4.x.nix | 2 +- pkgs/development/libraries/opencv/default.nix | 2 +- pkgs/development/libraries/opendbx/default.nix | 6 ++-- pkgs/development/libraries/opendht/default.nix | 4 +-- pkgs/development/libraries/opendkim/default.nix | 4 +-- pkgs/development/libraries/opendmarc/default.nix | 4 +-- pkgs/development/libraries/openexr/default.nix | 2 +- .../libraries/openexrid-unstable/default.nix | 4 +-- pkgs/development/libraries/openfst/default.nix | 4 +-- pkgs/development/libraries/openfx/default.nix | 4 +-- .../libraries/opengrm-ngram/default.nix | 4 +-- pkgs/development/libraries/openh264/default.nix | 4 +-- pkgs/development/libraries/openhmd/default.nix | 8 ++--- .../libraries/openimagedenoise/default.nix | 4 +-- pkgs/development/libraries/openjpeg/generic.nix | 6 ++-- pkgs/development/libraries/openldap/default.nix | 12 ++++---- pkgs/development/libraries/openmpi/default.nix | 6 ++-- pkgs/development/libraries/openpa/default.nix | 8 ++--- .../development/libraries/opensaml-cpp/default.nix | 4 +-- .../libraries/openscenegraph/default.nix | 2 +- pkgs/development/libraries/openslp/default.nix | 4 +-- pkgs/development/libraries/openssl/chacha.nix | 10 +++--- pkgs/development/libraries/openssl/default.nix | 24 +++++++-------- .../libraries/opentracing-cpp/default.nix | 6 ++-- pkgs/development/libraries/openvdb/default.nix | 4 +-- pkgs/development/libraries/openwsman/default.nix | 4 +-- .../libraries/openxr-loader/default.nix | 4 +-- pkgs/development/libraries/openzwave/default.nix | 4 +-- .../libraries/oracle-instantclient/default.nix | 6 ++-- pkgs/development/libraries/orcania/default.nix | 4 +-- pkgs/development/libraries/ortp/default.nix | 4 +-- pkgs/development/libraries/osip/default.nix | 8 ++--- pkgs/development/libraries/osm-gps-map/default.nix | 4 +-- pkgs/development/libraries/p11-kit/default.nix | 4 +-- pkgs/development/libraries/packr/default.nix | 2 +- pkgs/development/libraries/pagmo2/default.nix | 4 +-- pkgs/development/libraries/pango/default.nix | 10 +++--- pkgs/development/libraries/pangolin/default.nix | 6 ++-- pkgs/development/libraries/pangomm/default.nix | 8 ++--- pkgs/development/libraries/pangoxsl/default.nix | 4 +-- pkgs/development/libraries/partio/default.nix | 4 +-- .../libraries/pc-ble-driver/default.nix | 8 ++--- pkgs/development/libraries/pcaudiolib/default.nix | 2 +- pkgs/development/libraries/pcg-c/default.nix | 6 ++-- pkgs/development/libraries/pcl/default.nix | 14 ++++----- pkgs/development/libraries/pcre/default.nix | 6 ++-- pkgs/development/libraries/pcre2/default.nix | 6 ++-- pkgs/development/libraries/pdal/default.nix | 4 +-- pkgs/development/libraries/pdf2xml/default.nix | 4 +-- pkgs/development/libraries/phash/default.nix | 4 +-- .../libraries/phonetisaurus/default.nix | 4 +-- .../libraries/phonon/backends/gstreamer.nix | 2 +- pkgs/development/libraries/phonon/backends/vlc.nix | 2 +- pkgs/development/libraries/phonon/default.nix | 6 ++-- pkgs/development/libraries/physfs/default.nix | 6 ++-- .../libraries/physics/apfel/default.nix | 4 +-- .../libraries/physics/apfelgrid/default.nix | 4 +-- .../libraries/physics/applgrid/default.nix | 4 +-- .../libraries/physics/cernlib/default.nix | 6 ++-- .../libraries/physics/fastjet-contrib/default.nix | 4 +-- .../libraries/physics/fastjet/default.nix | 8 ++--- .../libraries/physics/fastnlo/default.nix | 8 ++--- .../libraries/physics/geant4/datasets.nix | 2 +- .../libraries/physics/geant4/default.nix | 18 +++++------ .../libraries/physics/hepmc2/default.nix | 4 +-- .../libraries/physics/hepmc3/default.nix | 12 ++++---- .../libraries/physics/herwig/default.nix | 4 +-- .../libraries/physics/hoppet/default.nix | 4 +-- .../libraries/physics/lhapdf/default.nix | 12 ++++---- .../libraries/physics/lhapdf/pdf_sets.nix | 4 +-- .../development/libraries/physics/mela/default.nix | 4 +-- .../libraries/physics/nlojet/default.nix | 8 ++--- .../libraries/physics/pythia/default.nix | 10 +++--- .../libraries/physics/qcdnum/default.nix | 8 ++--- .../libraries/physics/rivet/default.nix | 6 ++-- .../libraries/physics/thepeg/default.nix | 4 +-- .../development/libraries/physics/yoda/default.nix | 10 +++--- pkgs/development/libraries/pipewire/0.2.nix | 4 +-- pkgs/development/libraries/pipewire/default.nix | 2 +- pkgs/development/libraries/pixman/default.nix | 6 ++-- .../development/libraries/pkcs11helper/default.nix | 4 +-- pkgs/development/libraries/pkger/default.nix | 2 +- pkgs/development/libraries/plib/default.nix | 6 ++-- pkgs/development/libraries/plplot/default.nix | 4 +-- pkgs/development/libraries/pmdk/default.nix | 4 +-- pkgs/development/libraries/pmix/default.nix | 4 +-- pkgs/development/libraries/png++/default.nix | 10 +++--- .../development/libraries/pocketsphinx/default.nix | 6 ++-- pkgs/development/libraries/poco/default.nix | 4 +-- pkgs/development/libraries/podofo/default.nix | 4 +-- pkgs/development/libraries/polkit-qt-1/qt-4.nix | 6 ++-- pkgs/development/libraries/polkit-qt-1/qt-5.nix | 8 ++--- pkgs/development/libraries/polkit/default.nix | 16 +++++----- pkgs/development/libraries/poly2tri-c/default.nix | 6 ++-- pkgs/development/libraries/poppler/0.61.nix | 2 +- pkgs/development/libraries/poppler/default.nix | 2 +- pkgs/development/libraries/popt/default.nix | 6 ++-- pkgs/development/libraries/portaudio/default.nix | 16 +++++----- pkgs/development/libraries/portmidi/default.nix | 8 ++--- pkgs/development/libraries/ppl/default.nix | 8 ++--- pkgs/development/libraries/prison/default.nix | 4 +-- .../libraries/proj-datumgrid/default.nix | 4 +-- pkgs/development/libraries/proj/5.2.nix | 4 +-- pkgs/development/libraries/proj/default.nix | 4 +-- .../libraries/prometheus-client-c/default.nix | 8 ++--- .../libraries/prometheus-cpp/default.nix | 4 +-- .../libraries/properties-cpp/default.nix | 4 +-- pkgs/development/libraries/protobuf/generic-v3.nix | 8 ++--- pkgs/development/libraries/protobuf/generic.nix | 6 ++-- pkgs/development/libraries/protobufc/generic.nix | 4 +-- pkgs/development/libraries/prototypejs/default.nix | 4 +-- pkgs/development/libraries/protozero/default.nix | 4 +-- pkgs/development/libraries/pslib/default.nix | 4 +-- pkgs/development/libraries/psol/generic.nix | 6 ++-- pkgs/development/libraries/psqlodbc/default.nix | 4 +-- pkgs/development/libraries/pstreams/default.nix | 6 ++-- pkgs/development/libraries/ptex/default.nix | 4 +-- pkgs/development/libraries/pth/default.nix | 8 ++--- pkgs/development/libraries/pupnp/default.nix | 4 +-- pkgs/development/libraries/pxlib/default.nix | 4 +-- pkgs/development/libraries/pyotherside/default.nix | 4 +-- pkgs/development/libraries/python-qt/default.nix | 4 +-- pkgs/development/libraries/qca-qt5/default.nix | 6 ++-- pkgs/development/libraries/qca2/default.nix | 6 ++-- pkgs/development/libraries/qhull/default.nix | 4 +-- pkgs/development/libraries/qimageblitz/default.nix | 6 ++-- pkgs/development/libraries/qjson/default.nix | 4 +-- pkgs/development/libraries/qmlbox2d/default.nix | 4 +-- .../libraries/qmltermwidget/default.nix | 10 +++--- pkgs/development/libraries/qoauth/default.nix | 4 +-- pkgs/development/libraries/qpdf/default.nix | 4 +-- pkgs/development/libraries/qrcodegen/default.nix | 4 +-- pkgs/development/libraries/qrencode/default.nix | 6 ++-- pkgs/development/libraries/qrupdate/default.nix | 8 ++--- pkgs/development/libraries/qscintilla/default.nix | 2 +- pkgs/development/libraries/qt-3/default.nix | 24 +++++++-------- pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +- pkgs/development/libraries/qt-mobility/default.nix | 4 +-- pkgs/development/libraries/qtkeychain/default.nix | 12 ++++---- .../libraries/qtpbfimageplugin/default.nix | 6 ++-- .../libraries/qtscriptgenerator/default.nix | 4 +-- .../qtstyleplugin-kvantum-qt4/default.nix | 4 +-- .../libraries/qtstyleplugin-kvantum/default.nix | 4 +-- .../libraries/qtstyleplugins/default.nix | 4 +-- pkgs/development/libraries/qtutilities/default.nix | 4 +-- .../libraries/qtwebkit-plugins/default.nix | 6 ++-- pkgs/development/libraries/quazip/default.nix | 6 ++-- pkgs/development/libraries/quesoglc/default.nix | 4 +-- pkgs/development/libraries/quickder/default.nix | 4 +-- pkgs/development/libraries/quickfix/default.nix | 4 +-- pkgs/development/libraries/qwt/6.nix | 6 ++-- pkgs/development/libraries/qwt/6_qt4.nix | 10 +++--- pkgs/development/libraries/qwt/default.nix | 6 ++-- pkgs/development/libraries/qxt/default.nix | 8 ++--- pkgs/development/libraries/rabbitmq-c/default.nix | 4 +-- .../libraries/rabbitmq-java-client/default.nix | 4 +-- .../libraries/raft-canonical/default.nix | 4 +-- pkgs/development/libraries/randomx/default.nix | 4 +-- pkgs/development/libraries/rang/default.nix | 4 +-- pkgs/development/libraries/range-v3/default.nix | 6 ++-- pkgs/development/libraries/rapidcheck/default.nix | 4 +-- pkgs/development/libraries/rapidxml/default.nix | 4 +-- pkgs/development/libraries/rarian/default.nix | 6 ++-- pkgs/development/libraries/rdkafka/default.nix | 4 +-- pkgs/development/libraries/re2/default.nix | 6 ++-- pkgs/development/libraries/readline/5.x.nix | 6 ++-- pkgs/development/libraries/readline/6.2.nix | 6 ++-- pkgs/development/libraries/readline/6.3.nix | 8 ++--- pkgs/development/libraries/readline/7.0.nix | 4 +-- pkgs/development/libraries/readline/8.0.nix | 4 +-- pkgs/development/libraries/readosm/default.nix | 6 ++-- pkgs/development/libraries/redkite/default.nix | 4 +-- pkgs/development/libraries/rep-gtk/default.nix | 4 +-- .../libraries/resolv_wrapper/default.nix | 4 +-- pkgs/development/libraries/rlog/default.nix | 6 ++-- pkgs/development/libraries/rlottie/default.nix | 4 +-- .../libraries/rnnoise-plugin/default.nix | 4 +-- pkgs/development/libraries/robin-map/default.nix | 4 +-- pkgs/development/libraries/rocclr/default.nix | 4 +-- pkgs/development/libraries/rocksdb/default.nix | 16 +++++----- pkgs/development/libraries/rocm-comgr/default.nix | 4 +-- .../libraries/rocm-device-libs/default.nix | 4 +-- .../libraries/rocm-opencl-icd/default.nix | 4 +-- .../libraries/rocm-opencl-runtime/default.nix | 4 +-- .../development/libraries/rocm-runtime/default.nix | 4 +-- pkgs/development/libraries/rocm-thunk/default.nix | 4 +-- pkgs/development/libraries/rote/default.nix | 4 +-- pkgs/development/libraries/rttr/default.nix | 4 +-- pkgs/development/libraries/rubberband/default.nix | 4 +-- pkgs/development/libraries/safefile/default.nix | 8 ++--- pkgs/development/libraries/sbc/default.nix | 4 +-- pkgs/development/libraries/sblim-sfcc/default.nix | 4 +-- .../development/libraries/schroedinger/default.nix | 4 +-- .../libraries/science/benchmark/papi/default.nix | 4 +-- .../libraries/science/biology/EBTKS/default.nix | 4 +-- .../libraries/science/biology/bicgl/default.nix | 4 +-- .../libraries/science/biology/bicpl/default.nix | 4 +-- .../libraries/science/biology/bpp-core/default.nix | 4 +-- .../libraries/science/biology/elastix/default.nix | 6 ++-- .../science/biology/gifticlib/default.nix | 4 +-- .../libraries/science/biology/htslib/default.nix | 4 +-- .../libraries/science/biology/mirtk/default.nix | 4 +-- .../science/biology/nifticlib/default.nix | 4 +-- .../libraries/science/biology/oobicpl/default.nix | 4 +-- .../libraries/science/math/QuadProgpp/default.nix | 4 +-- .../libraries/science/math/amd-blis/default.nix | 6 ++-- .../science/math/amd-libflame/default.nix | 2 +- .../libraries/science/math/arpack/default.nix | 10 +++--- .../libraries/science/math/blas/default.nix | 10 +++--- .../libraries/science/math/blis/default.nix | 6 ++-- .../libraries/science/math/brial/default.nix | 4 +-- .../libraries/science/math/caffe2/default.nix | 6 ++-- .../science/math/cholmod-extra/default.nix | 4 +-- .../libraries/science/math/clblas/default.nix | 10 +++--- .../libraries/science/math/cliquer/default.nix | 4 +-- .../libraries/science/math/clmagma/default.nix | 6 ++-- .../libraries/science/math/cudnn/generic.nix | 2 +- .../libraries/science/math/ecos/default.nix | 4 +-- .../libraries/science/math/fenics/default.nix | 24 +++++++-------- .../libraries/science/math/flintqs/default.nix | 4 +-- .../libraries/science/math/ipopt/default.nix | 4 +-- .../libraries/science/math/itpp/default.nix | 4 +-- .../libraries/science/math/lcalc/default.nix | 8 ++--- .../libraries/science/math/libbraiding/default.nix | 4 +-- .../libraries/science/math/libhomfly/default.nix | 4 +-- .../libraries/science/math/liblapack/default.nix | 6 ++-- .../libraries/science/math/liblbfgs/default.nix | 6 ++-- .../libraries/science/math/libtorch/bin.nix | 12 ++++---- .../libraries/science/math/lrs/default.nix | 8 ++--- .../libraries/science/math/m4ri/default.nix | 4 +-- .../libraries/science/math/m4rie/default.nix | 4 +-- .../libraries/science/math/magma/default.nix | 6 ++-- .../libraries/science/math/metis/default.nix | 6 ++-- .../libraries/science/math/mongoose/default.nix | 4 +-- .../libraries/science/math/nccl/default.nix | 4 +-- .../libraries/science/math/openblas/default.nix | 10 +++--- .../libraries/science/math/openlibm/default.nix | 8 ++--- .../libraries/science/math/openspecfun/default.nix | 8 ++--- .../libraries/science/math/or-tools/default.nix | 4 +-- .../libraries/science/math/osi/default.nix | 2 +- .../libraries/science/math/osqp/default.nix | 4 +-- .../libraries/science/math/parmetis/default.nix | 4 +-- .../libraries/science/math/petsc/default.nix | 6 ++-- .../libraries/science/math/planarity/default.nix | 4 +-- .../libraries/science/math/primesieve/default.nix | 4 +-- .../libraries/science/math/rankwidth/default.nix | 4 +-- .../libraries/science/math/rubiks/default.nix | 4 +-- .../libraries/science/math/scalapack/default.nix | 4 +-- .../libraries/science/math/scs/default.nix | 6 ++-- .../libraries/science/math/spooles/default.nix | 6 ++-- .../science/math/suitesparse-graphblas/default.nix | 4 +-- .../libraries/science/math/suitesparse/4.2.nix | 4 +-- .../libraries/science/math/suitesparse/4.4.nix | 12 ++++---- .../libraries/science/math/suitesparse/default.nix | 14 ++++----- .../libraries/science/math/superlu/default.nix | 4 +-- .../libraries/science/math/sympow/default.nix | 4 +-- .../libraries/science/math/tensorflow/bin.nix | 4 +-- .../libraries/science/networking/ns-3/default.nix | 10 +++--- .../libraries/science/robotics/ispike/default.nix | 8 ++--- pkgs/development/libraries/scmccid/default.nix | 8 ++--- .../libraries/scriptaculous/default.nix | 4 +-- pkgs/development/libraries/seasocks/default.nix | 4 +-- .../libraries/sentencepiece/default.nix | 2 +- pkgs/development/libraries/serd/default.nix | 4 +-- pkgs/development/libraries/serf/default.nix | 8 ++--- pkgs/development/libraries/serialdv/default.nix | 4 +-- pkgs/development/libraries/sfml/default.nix | 10 +++--- pkgs/development/libraries/sfsexp/default.nix | 4 +-- pkgs/development/libraries/shapelib/default.nix | 4 +-- pkgs/development/libraries/shhmsg/default.nix | 4 +-- pkgs/development/libraries/shhopt/default.nix | 4 +-- .../libraries/shibboleth-sp/default.nix | 4 +-- pkgs/development/libraries/silgraphite/default.nix | 4 +-- .../libraries/silgraphite/graphite2.nix | 6 ++-- pkgs/development/libraries/simdjson/default.nix | 4 +-- pkgs/development/libraries/simgear/default.nix | 4 +-- pkgs/development/libraries/simpleitk/default.nix | 4 +-- pkgs/development/libraries/slang/default.nix | 6 ++-- pkgs/development/libraries/slib/default.nix | 6 ++-- .../development/libraries/smarty3-i18n/default.nix | 4 +-- pkgs/development/libraries/smarty3/default.nix | 4 +-- pkgs/development/libraries/smesh/default.nix | 6 ++-- pkgs/development/libraries/smpeg/default.nix | 6 ++-- pkgs/development/libraries/smpeg2/default.nix | 6 ++-- pkgs/development/libraries/snack/default.nix | 4 +-- pkgs/development/libraries/snappy/default.nix | 4 +-- pkgs/development/libraries/soci/default.nix | 4 +-- .../libraries/socket_wrapper/default.nix | 4 +-- pkgs/development/libraries/sofia-sip/default.nix | 4 +-- pkgs/development/libraries/sonic/default.nix | 6 ++-- pkgs/development/libraries/soprano/default.nix | 4 +-- pkgs/development/libraries/soqt/default.nix | 4 +-- pkgs/development/libraries/sord/default.nix | 4 +-- pkgs/development/libraries/soxt/default.nix | 4 +-- pkgs/development/libraries/spandsp/3.nix | 8 ++--- pkgs/development/libraries/spandsp/default.nix | 8 ++--- pkgs/development/libraries/sparsehash/default.nix | 4 +-- .../libraries/spatialite-tools/default.nix | 6 ++-- pkgs/development/libraries/spdk/default.nix | 4 +-- pkgs/development/libraries/spdlog/default.nix | 4 +-- .../development/libraries/speech-tools/default.nix | 4 +-- pkgs/development/libraries/speechd/default.nix | 6 ++-- pkgs/development/libraries/speex/default.nix | 4 +-- pkgs/development/libraries/speexdsp/default.nix | 6 ++-- pkgs/development/libraries/sphinxbase/default.nix | 10 +++--- pkgs/development/libraries/spice-gtk/default.nix | 6 ++-- .../libraries/spice-protocol/default.nix | 4 +-- pkgs/development/libraries/spice/default.nix | 4 +-- .../libraries/spirv-headers/default.nix | 4 +-- pkgs/development/libraries/sqlcipher/default.nix | 2 +- pkgs/development/libraries/sqlite/default.nix | 6 ++-- pkgs/development/libraries/sqlite/sqlar.nix | 4 +-- pkgs/development/libraries/sqlite/tools.nix | 8 ++--- pkgs/development/libraries/srt/default.nix | 4 +-- pkgs/development/libraries/srtp/default.nix | 4 +-- .../libraries/startup-notification/default.nix | 4 +-- pkgs/development/libraries/stb/default.nix | 4 +-- .../libraries/stellarsolver/default.nix | 4 +-- pkgs/development/libraries/stfl/default.nix | 10 +++--- pkgs/development/libraries/stlport/default.nix | 4 +-- pkgs/development/libraries/stxxl/default.nix | 4 +-- pkgs/development/libraries/subunit/default.nix | 4 +-- pkgs/development/libraries/sundials/default.nix | 12 ++++---- pkgs/development/libraries/svrcore/default.nix | 4 +-- pkgs/development/libraries/swiften/default.nix | 4 +-- pkgs/development/libraries/swiftshader/default.nix | 4 +-- pkgs/development/libraries/sword/default.nix | 4 +-- pkgs/development/libraries/sycl-info/default.nix | 6 ++-- pkgs/development/libraries/symengine/default.nix | 4 +-- pkgs/development/libraries/szip/default.nix | 4 +-- pkgs/development/libraries/t1lib/default.nix | 6 ++-- pkgs/development/libraries/tachyon/default.nix | 20 ++++++------ .../libraries/taglib-extras/default.nix | 4 +-- .../development/libraries/taglib-sharp/default.nix | 4 +-- pkgs/development/libraries/taglib/default.nix | 4 +-- pkgs/development/libraries/talloc/default.nix | 8 ++--- pkgs/development/libraries/tbb/default.nix | 6 ++-- pkgs/development/libraries/tclap/default.nix | 4 +-- pkgs/development/libraries/tcllib/default.nix | 6 ++-- pkgs/development/libraries/tcltls/default.nix | 6 ++-- pkgs/development/libraries/tclx/default.nix | 6 ++-- pkgs/development/libraries/tdb/default.nix | 4 +-- pkgs/development/libraries/tdlib/default.nix | 4 +-- pkgs/development/libraries/tecla/default.nix | 6 ++-- .../libraries/telepathy/farstream/default.nix | 4 +-- .../libraries/telepathy/glib/default.nix | 4 +-- .../development/libraries/telepathy/qt/default.nix | 6 ++-- .../libraries/template-glib/default.nix | 6 ++-- pkgs/development/libraries/tepl/default.nix | 6 ++-- pkgs/development/libraries/termbox/default.nix | 4 +-- pkgs/development/libraries/tevent/default.nix | 4 +-- pkgs/development/libraries/theft/default.nix | 4 +-- pkgs/development/libraries/thrift/0.10.nix | 4 +-- pkgs/development/libraries/thrift/default.nix | 10 +++--- pkgs/development/libraries/ti-rpc/default.nix | 4 +-- pkgs/development/libraries/ticpp/default.nix | 4 +-- pkgs/development/libraries/tidyp/default.nix | 4 +-- pkgs/development/libraries/timezonemap/default.nix | 4 +-- pkgs/development/libraries/tinycbor/default.nix | 4 +-- .../libraries/tinyobjloader/default.nix | 4 +-- pkgs/development/libraries/tinyxml-2/default.nix | 6 ++-- pkgs/development/libraries/tinyxml/2.6.2.nix | 10 +++--- pkgs/development/libraries/tix/default.nix | 6 ++-- pkgs/development/libraries/tk/8.6.nix | 4 +-- pkgs/development/libraries/tk/generic.nix | 8 ++--- pkgs/development/libraries/tl-expected/default.nix | 4 +-- pkgs/development/libraries/tnt/default.nix | 6 ++-- pkgs/development/libraries/tntdb/default.nix | 4 +-- pkgs/development/libraries/tntnet/default.nix | 4 +-- .../libraries/tokyo-cabinet/default.nix | 6 ++-- .../development/libraries/tokyo-tyrant/default.nix | 6 ++-- .../libraries/totem-pl-parser/default.nix | 6 ++-- .../libraries/tracker-miners/default.nix | 6 ++-- pkgs/development/libraries/tracker/default.nix | 6 ++-- pkgs/development/libraries/tre/default.nix | 6 ++-- pkgs/development/libraries/tremor/default.nix | 6 ++-- pkgs/development/libraries/trompeloeil/default.nix | 4 +-- pkgs/development/libraries/tsocks/default.nix | 6 ++-- pkgs/development/libraries/tweeny/default.nix | 4 +-- pkgs/development/libraries/twolame/default.nix | 4 +-- pkgs/development/libraries/ubus/default.nix | 4 +-- pkgs/development/libraries/uci/default.nix | 4 +-- pkgs/development/libraries/ucl/default.nix | 8 ++--- pkgs/development/libraries/ucommon/default.nix | 8 ++--- pkgs/development/libraries/ucx/default.nix | 4 +-- pkgs/development/libraries/udns/default.nix | 4 +-- pkgs/development/libraries/udunits/default.nix | 4 +-- pkgs/development/libraries/uid_wrapper/default.nix | 4 +-- pkgs/development/libraries/umockdev/default.nix | 4 +-- pkgs/development/libraries/unibilium/default.nix | 2 +- pkgs/development/libraries/unicap/default.nix | 4 +-- pkgs/development/libraries/unicorn/default.nix | 4 +-- .../development/libraries/unittest-cpp/default.nix | 6 ++-- pkgs/development/libraries/unixODBC/default.nix | 4 +-- .../libraries/unixODBCDrivers/default.nix | 10 +++--- pkgs/development/libraries/unqlite/default.nix | 4 +-- pkgs/development/libraries/uri/default.nix | 6 ++-- pkgs/development/libraries/uriparser/default.nix | 2 +- pkgs/development/libraries/usbredir/default.nix | 4 +-- pkgs/development/libraries/ustr/default.nix | 4 +-- pkgs/development/libraries/utf8cpp/default.nix | 4 +-- pkgs/development/libraries/utf8proc/default.nix | 4 +-- pkgs/development/libraries/uthash/default.nix | 4 +-- pkgs/development/libraries/v8/5_x.nix | 6 ++-- pkgs/development/libraries/v8/default.nix | 8 ++--- .../libraries/vaapi-intel-hybrid/default.nix | 4 +-- pkgs/development/libraries/vaapi-intel/default.nix | 10 +++--- pkgs/development/libraries/vaapi-vdpau/default.nix | 4 +-- .../libraries/vapoursynth-mvtools/default.nix | 4 +-- pkgs/development/libraries/vapoursynth/default.nix | 6 ++-- pkgs/development/libraries/vapoursynth/editor.nix | 6 ++-- pkgs/development/libraries/vc/0.7.nix | 4 +-- pkgs/development/libraries/vc/default.nix | 4 +-- pkgs/development/libraries/vcg/default.nix | 4 +-- pkgs/development/libraries/vid-stab/default.nix | 6 ++-- pkgs/development/libraries/vigra/default.nix | 8 ++--- .../libraries/virglrenderer/default.nix | 4 +-- pkgs/development/libraries/vmime/default.nix | 8 ++--- pkgs/development/libraries/vmmlib/default.nix | 6 ++-- pkgs/development/libraries/vo-amrwbenc/default.nix | 8 ++--- pkgs/development/libraries/volume-key/default.nix | 4 +-- pkgs/development/libraries/vrb/default.nix | 4 +-- pkgs/development/libraries/vrpn/default.nix | 4 +-- pkgs/development/libraries/vsqlite/default.nix | 6 ++-- pkgs/development/libraries/vte/2.90.nix | 4 +-- pkgs/development/libraries/vte/default.nix | 4 +-- .../libraries/vulkan-headers/default.nix | 4 +-- .../libraries/vulkan-loader/default.nix | 4 +-- pkgs/development/libraries/vxl/default.nix | 8 ++--- pkgs/development/libraries/waffle/default.nix | 10 +++--- pkgs/development/libraries/wasilibc/default.nix | 2 +- pkgs/development/libraries/wavpack/default.nix | 6 ++-- pkgs/development/libraries/waylandpp/default.nix | 8 ++--- pkgs/development/libraries/wcslib/default.nix | 6 ++-- pkgs/development/libraries/webkitgtk/default.nix | 8 ++--- .../libraries/webrtc-audio-processing/default.nix | 8 ++--- pkgs/development/libraries/websocket++/default.nix | 4 +-- pkgs/development/libraries/wildmidi/default.nix | 4 +-- pkgs/development/libraries/wiredtiger/default.nix | 6 ++-- pkgs/development/libraries/wlroots/default.nix | 4 +-- pkgs/development/libraries/wolfssl/default.nix | 6 ++-- pkgs/development/libraries/wt/default.nix | 10 +++--- pkgs/development/libraries/wtk/default.nix | 4 +-- pkgs/development/libraries/wxSVG/default.nix | 4 +-- pkgs/development/libraries/wxsqlite3/default.nix | 6 ++-- .../development/libraries/wxsqliteplus/default.nix | 4 +-- .../libraries/wxwidgets/2.8/default.nix | 8 ++--- .../libraries/wxwidgets/2.9/default.nix | 8 ++--- .../libraries/wxwidgets/3.0/default.nix | 6 ++-- pkgs/development/libraries/wxwidgets/3.0/mac.nix | 4 +-- .../libraries/wxwidgets/3.1/default.nix | 6 ++-- pkgs/development/libraries/x264/default.nix | 6 ++-- pkgs/development/libraries/x265/default.nix | 12 ++++---- pkgs/development/libraries/xalanc/default.nix | 8 ++--- pkgs/development/libraries/xapian/default.nix | 8 ++--- .../libraries/xapian/tools/omega/default.nix | 4 +-- pkgs/development/libraries/xavs/default.nix | 6 ++-- pkgs/development/libraries/xbase/default.nix | 4 +-- pkgs/development/libraries/xcb-imdkit/default.nix | 4 +-- .../development/libraries/xcb-util-cursor/HEAD.nix | 4 +-- .../libraries/xdg-dbus-proxy/default.nix | 4 +-- .../libraries/xdg-desktop-portal-gtk/default.nix | 4 +-- .../libraries/xdg-desktop-portal-wlr/default.nix | 4 +-- .../libraries/xdg-desktop-portal/default.nix | 4 +-- pkgs/development/libraries/xed/default.nix | 4 +-- pkgs/development/libraries/xercesc/default.nix | 6 ++-- pkgs/development/libraries/xgboost/default.nix | 2 +- pkgs/development/libraries/xine-lib/default.nix | 4 +-- .../libraries/xlibs-wrapper/default.nix | 4 +-- pkgs/development/libraries/xlslib/default.nix | 4 +-- .../libraries/xml-security-c/default.nix | 8 ++--- .../libraries/xml-tooling-c/default.nix | 4 +-- pkgs/development/libraries/xmlrpc-c/default.nix | 4 +-- pkgs/development/libraries/xmlsec/default.nix | 6 ++-- pkgs/development/libraries/xsd/default.nix | 8 ++--- pkgs/development/libraries/xvidcore/default.nix | 4 +-- pkgs/development/libraries/xxHash/default.nix | 6 ++-- pkgs/development/libraries/xylib/default.nix | 4 +-- pkgs/development/libraries/yajl/default.nix | 8 ++--- pkgs/development/libraries/yojimbo/default.nix | 4 +-- pkgs/development/libraries/yubico-pam/default.nix | 4 +-- pkgs/development/libraries/zchunk/default.nix | 6 ++-- pkgs/development/libraries/zeitgeist/default.nix | 8 ++--- pkgs/development/libraries/zeroc-ice/3.6.nix | 2 +- pkgs/development/libraries/zeroc-ice/default.nix | 2 +- pkgs/development/libraries/zeromq/4.x.nix | 6 ++-- pkgs/development/libraries/zimg/default.nix | 4 +-- pkgs/development/libraries/zimlib/default.nix | 4 +-- pkgs/development/libraries/zlib/default.nix | 32 +++++++++---------- pkgs/development/libraries/zlog/default.nix | 4 +-- pkgs/development/libraries/zmqpp/default.nix | 4 +-- .../development/libraries/zookeeper_mt/default.nix | 6 ++-- pkgs/development/libraries/zxcvbn-c/default.nix | 4 +-- pkgs/development/libraries/zziplib/default.nix | 4 +-- 1770 files changed, 4913 insertions(+), 4912 deletions(-) (limited to 'pkgs/development/libraries/libuv/default.nix') diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix index ab9440c3034..c26672c1dab 100644 --- a/pkgs/development/libraries/AntTweakBar/default.nix +++ b/pkgs/development/libraries/AntTweakBar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, xorg, libGLU, libGL }: +{ lib, stdenv, fetchurl, unzip, xorg, libGLU, libGL }: stdenv.mkDerivation { name = "AntTweakBar-1.16"; @@ -26,8 +26,8 @@ stdenv.mkDerivation { to interactively tweak parameters on-screen ''; homepage = "http://anttweakbar.sourceforge.net/"; - license = stdenv.lib.licenses.zlib; - maintainers = [ stdenv.lib.maintainers.razvan ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.zlib; + maintainers = [ lib.maintainers.razvan ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/CGAL/4.nix b/pkgs/development/libraries/CGAL/4.nix index ad900744f54..7028572174f 100644 --- a/pkgs/development/libraries/CGAL/4.nix +++ b/pkgs/development/libraries/CGAL/4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { version = "4.14.2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Computational Geometry Algorithms Library"; homepage = "http://cgal.org"; license = with licenses; [ gpl3Plus lgpl3Plus]; diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index ca350348986..7ff9ac43343 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , boost @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Computational Geometry Algorithms Library"; homepage = "http://cgal.org"; license = with licenses; [ gpl3Plus lgpl3Plus]; diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index 7adb6e6437e..d34b465f135 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "CoinMP"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://projects.coin-or.org/CoinMP/"; description = "COIN-OR lightweight API for COIN-OR libraries CLP, CBC, and CGL"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/development/libraries/LAStools/default.nix index c231361acb5..61a39aa8e76 100644 --- a/pkgs/development/libraries/LAStools/default.nix +++ b/pkgs/development/libraries/LAStools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "LAStools"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Software for rapid LiDAR processing"; homepage = http://lastools.org/; license = licenses.unfree; diff --git a/pkgs/development/libraries/LASzip/LASzip2.nix b/pkgs/development/libraries/LASzip/LASzip2.nix index 2eb30963128..b080153826a 100644 --- a/pkgs/development/libraries/LASzip/LASzip2.nix +++ b/pkgs/development/libraries/LASzip/LASzip2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { version = "2.2.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; homepage = "https://laszip.org"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix index 0300aa37f0f..f170ea44c0e 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/development/libraries/LASzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { version = "3.4.3"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; homepage = "https://laszip.org"; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.michelk ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2; + maintainers = [ lib.maintainers.michelk ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/development/libraries/NSPlist/default.nix index 9cf5e919548..1b8ae939eca 100644 --- a/pkgs/development/libraries/NSPlist/default.nix +++ b/pkgs/development/libraries/NSPlist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation { name = "NSPlist-713decf"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; description = "Parses .plist files"; license = licenses.mit; diff --git a/pkgs/development/libraries/PlistCpp/default.nix b/pkgs/development/libraries/PlistCpp/default.nix index 3501fa8b435..f7c47805748 100644 --- a/pkgs/development/libraries/PlistCpp/default.nix +++ b/pkgs/development/libraries/PlistCpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }: stdenv.mkDerivation { name = "PlistCpp-11615d"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ boost NSPlist pugixml ]; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; description = "CPP bindings for Plist"; license = licenses.mit; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index e13c94bcb6e..252d38d1192 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,5 +1,5 @@ -{ stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +{ lib, stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv +, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL, libGLU , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid @@ -11,7 +11,7 @@ # NOTE: When editing this expression see if the same change applies to # SDL2 expression too -with stdenv.lib; +with lib; let extraPropagatedBuildInputs = [ ] @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform multimedia library"; homepage = "http://www.libsdl.org/"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 1fa021feb85..ddde76cac64 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,5 +1,5 @@ -{ stdenv, config, fetchurl, pkg-config -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +{ lib, stdenv, config, fetchurl, pkg-config +, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid @@ -21,7 +21,7 @@ # NOTE: When editing this expression see if the same change applies to # SDL expression too -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "SDL2"; @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { passthru = { inherit openglSupport; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform multimedia library"; homepage = "http://www.libsdl.org/"; license = licenses.zlib; diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index 1ed56c6750f..2da2189b1a8 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, darwin, fetchurl, SDL2 }: +{ lib, stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { pname = "SDL2_gfx"; @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ SDL2 ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; + ++ lib.optional stdenv.isDarwin darwin.libobjc; configureFlags = [(if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx")] - ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + ++ lib.optional stdenv.isDarwin "--disable-sdltest"; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL graphics drawing primitives and support functions"; longDescription = '' diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index 00de774ba6e..96f85ddb0ea 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libwebp, libXpm, zlib, Foundation }: +{ lib, stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libwebp, libXpm, zlib, Foundation }: stdenv.mkDerivation rec { pname = "SDL2_image"; @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ SDL2 libpng libjpeg libtiff libungif libwebp libXpm zlib ] - ++ stdenv.lib.optional stdenv.isDarwin Foundation; + ++ lib.optional stdenv.isDarwin Foundation; - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL image library"; homepage = "http://www.libsdl.org/projects/SDL_image/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index af0da7dc627..7e1d097ba5c 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , AudioToolbox @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ AudioToolbox AudioUnit CoreServices @@ -51,12 +51,12 @@ stdenv.mkDerivation rec { "--disable-music-mp3-mpg123-shared" "--disable-music-opus-shared" "--disable-music-midi-fluidsynth-shared" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL multi-channel audio mixer library"; platforms = platforms.unix; homepage = "https://www.libsdl.org/projects/SDL_mixer/"; diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index 0bec12cdb24..fe6cb9445a3 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -1,4 +1,4 @@ -{ stdenv, darwin, fetchurl, SDL2 }: +{ lib, stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { pname = "SDL2_net"; @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; }; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc; + buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; propagatedBuildInputs = [ SDL2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL multiplatform networking library"; homepage = "https://www.libsdl.org/projects/SDL_net"; license = licenses.zlib; diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 571c953a81b..e23b3fb9215 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, darwin, fetchurl, SDL2, freetype, libGL }: +{ lib, stdenv, darwin, fetchurl, SDL2, freetype, libGL }: stdenv.mkDerivation rec { pname = "SDL2_ttf"; @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59"; }; - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; buildInputs = [ SDL2 freetype libGL ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; + ++ lib.optional stdenv.isDarwin darwin.libobjc; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL TrueType library"; platforms = platforms.unix; license = licenses.zlib; diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix index f5191a116c9..83afeaf2d67 100644 --- a/pkgs/development/libraries/SDL_Pango/default.nix +++ b/pkgs/development/libraries/SDL_Pango/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkg-config }: +{ lib, stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkg-config }: stdenv.mkDerivation rec { pname = "SDL_Pango"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ SDL pango ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Connects the Pango rendering engine to SDL"; license = licenses.lgpl21Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 606820120dc..f5a3d863553 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL }: +{ lib, stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { pname = "SDL_gfx"; @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ] ; configureFlags = [ "--disable-mmx" ] - ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + ++ lib.optional stdenv.isDarwin "--disable-sdltest"; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL graphics drawing primitives and support functions"; longDescription = '' diff --git a/pkgs/development/libraries/SDL_gpu/default.nix b/pkgs/development/libraries/SDL_gpu/default.nix index f15009c2f5d..dc52e6afeea 100644 --- a/pkgs/development/libraries/SDL_gpu/default.nix +++ b/pkgs/development/libraries/SDL_gpu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU }: +{ lib, stdenv, fetchFromGitHub, cmake, SDL2, libGLU }: stdenv.mkDerivation { pname = "SDL_gpu-unstable"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { sed -ie '213s#''${OUTPUT_DIR}/lib#''${CMAKE_INSTALL_LIBDIR}#' src/CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for high-performance, modern 2D graphics with SDL written in C"; homepage = "https://github.com/grimfang4/sdl-gpu"; license = licenses.mit; diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 968fc3d38af..2e5841b3f48 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }: +{ lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }: stdenv.mkDerivation rec { pname = "SDL_image"; @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { "--disable-jpg-shared" "--disable-png-shared" "--disable-tif-shared" - ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + ] ++ lib.optional stdenv.isDarwin "--disable-sdltest"; buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL image library"; homepage = "http://www.libsdl.org/projects/SDL_image/"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index e52273052b5..7f5e38f39b8 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl" ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL multi-channel audio mixer library"; homepage = "http://www.libsdl.org/projects/SDL_mixer/"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index a24020da015..f55332a0ee0 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL }: +{ lib, stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { pname = "SDL_net"; @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz"; }; - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; propagatedBuildInputs = [ SDL ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL networking library"; platforms = platforms.unix; license = licenses.zlib; diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix index a1e4dda6878..1bc4c8ba35c 100644 --- a/pkgs/development/libraries/SDL_sixel/default.nix +++ b/pkgs/development/libraries/SDL_sixel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, libsixel }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libsixel }: stdenv.mkDerivation { pname = "SDL_sixel"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsixel ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform multimedia library, that supports sixel graphics on consoles"; homepage = "https://github.com/saitoha/SDL1.2-SIXEL"; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix index 1f068c9e976..e6318b84859 100644 --- a/pkgs/development/libraries/SDL_stretch/default.nix +++ b/pkgs/development/libraries/SDL_stretch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL }: +{ lib, stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { pname = "SDL_stretch"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Stretch Functions For SDL"; homepage = "http://sdl-stretch.sourceforge.net/"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index cd6355c9ce2..5d353e3a6c0 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, SDL, freetype }: +{ lib, stdenv, fetchurl, fetchpatch, SDL, freetype }: stdenv.mkDerivation rec { pname = "SDL_ttf"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { buildInputs = [ SDL freetype ]; - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; - meta = with stdenv.lib; { + meta = with lib; { description = "SDL TrueType library"; license = licenses.zlib; platforms = platforms.all; diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 10d954397ff..88501ca1ee6 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , imake, gccmakedep, bison, flex, pkg-config , xlibsWrapper, libXmu, libXpm, libXp }: @@ -13,9 +13,9 @@ stdenv.mkDerivation { buildInputs = [ libXpm libXp ]; propagatedBuildInputs = [ xlibsWrapper libXmu ]; - meta = with stdenv.lib; { + meta = with lib; { description = "3D widget set based on the Athena Widget set"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; license = licenses.mit; }; } diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index 7cbb3699401..faa819ec561 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "a52dec"; @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { # fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686 # which can also be fixed with - # hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic"; + # hardeningDisable = lib.optional stdenv.isi686 "pic"; # but it's better to disable tests than loose ASLR on i686 doCheck = !stdenv.isi686; - meta = with stdenv.lib; { + meta = with lib; { description = "ATSC A/52 stream decoder"; homepage = "https://liba52.sourceforge.net/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index 94453264419..b007e71ce44 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, automake}: +{lib, stdenv, fetchurl, ncurses, automake}: stdenv.mkDerivation { name = "aalib-1.4rc5"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { outputs = [ "bin" "dev" "out" "man" "info" ]; setOutputFlags = false; # Doesn't support all the flags - patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; # The fuloong2f is not supported by aalib still preConfigure = '' @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "ASCII art graphics library"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.lgpl2; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix index 45e73410d28..95d1b873edd 100644 --- a/pkgs/development/libraries/abseil-cpp/default.nix +++ b/pkgs/development/libraries/abseil-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "abseil-cpp"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An open-source collection of C++ code designed to augment the C++ standard library"; homepage = "https://abseil.io/"; license = licenses.asl20; diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 362605d1050..f87a0bbe68b 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , substituteAll @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Bus interface for user account query and manipulation"; homepage = "https://www.freedesktop.org/wiki/Software/AccountsService"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 0fe777b7b2b..85df0b43353 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libtool, perl }: +{ lib, stdenv, fetchurl, pkg-config, libtool, perl }: stdenv.mkDerivation rec { pname = "ace"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { > include/makeinclude/platform_macros.GNU ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ADAPTIVE Communication Environment"; homepage = "http://www.dre.vanderbilt.edu/~schmidt/ACE.html"; license = licenses.doc; diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index 6e863e4eeba..2161ad9e59c 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, attr }: +{ lib, stdenv, fetchurl, gettext, attr }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://savannah.nongnu.org/projects/acl"; description = "Library and tools for manipulating access control lists"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index 030ff73f97f..b89683ac053 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, curl, expat, fuse, openssl +{ lib, stdenv, fetchFromGitHub, zlib, curl, expat, fuse, openssl , autoreconfHook, python3 }: @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib curl expat openssl python3 ] - ++ stdenv.lib.optionals stdenv.isLinux [ fuse ]; + ++ lib.optionals stdenv.isLinux [ fuse ]; meta = { homepage = "http://afflib.sourceforge.net/"; description = "Advanced forensic format library"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.bsdOriginal; - maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = lib.platforms.unix; + license = lib.licenses.bsdOriginal; + maintainers = [ lib.maintainers.raskin ]; inherit version; downloadPage = "https://github.com/sshock/AFFLIBv3/tags"; }; diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix index d50cbe26e56..1ae5ffb17ad 100644 --- a/pkgs/development/libraries/aften/default.nix +++ b/pkgs/development/libraries/aften/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "aften"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification"; homepage = "http://aften.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index f13cc698236..79bb783cc9f 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub }: +{ lib, stdenv, mkDerivation, fetchFromGitHub }: mkDerivation rec { version = "compat-2.6.1"; @@ -18,11 +18,11 @@ mkDerivation rec { cd .. ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/UlfNorell/agda-prelude"; description = "Programming library for Agda"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; maintainers = with maintainers; [ mudri alexarice turion ]; }; } diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix index dbcdaac532e..7ec892bfe02 100644 --- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix +++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { sha256 = "09ri3jmgp9jjwi1mzv4c3w6rvcmyx6spa2qxpwlcn0f4bmfva6wm"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ryanorendorff/functional-linear-algebra"; description = '' Formalizing linear algebra in Agda by representing matrices as functions diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix index 55cd6a742e5..2ebb3f66ed0 100644 --- a/pkgs/development/libraries/agda/iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub }: +{ lib, stdenv, mkDerivation, fetchFromGitHub }: mkDerivation (rec { version = "1.5.0"; @@ -22,10 +22,10 @@ mkDerivation (rec { meta = { homepage = "https://github.com/cedille/ial"; description = "Agda standard library developed at Iowa"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.free; + platforms = lib.platforms.unix; # broken since Agda 2.6.1 broken = true; - maintainers = with stdenv.lib.maintainers; [ alexarice turion ]; + maintainers = with lib.maintainers; [ alexarice turion ]; }; }) diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index e43e1bad3b6..1d8dc03bbde 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, ghcWithPackages }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, ghcWithPackages }: mkDerivation rec { pname = "standard-library"; @@ -16,11 +16,11 @@ mkDerivation rec { runhaskell GenerateEverything.hs ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; description = "A standard library for use with the Agda compiler"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; maintainers = with maintainers; [ jwiegley mudri alexarice turion ]; }; } diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 2b083a47a20..89585d908da 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkg-config +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config , freetype, SDL, libX11 }: stdenv.mkDerivation rec { @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { of course, AGG can do much more than that. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://www.antigrain.com/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index db22f463df0..cdcf4b7b8a4 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5-threadsafe }: +{ lib, stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5-threadsafe }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec mv $out/include $dev/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An open framework for storing and sharing scene data"; homepage = "http://alembic.io/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 20175486b16..ca1446dd935 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11 +{ lib, stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc , libXxf86vm, openal, libGLU, libGL, libjpeg, flac @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A game programming library"; homepage = "https://liballeg.org/"; license = licenses.zlib; diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 99d75225036..9fefbe01ace 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo6_5, libXext, xorgproto, libX11 +{ lib, stdenv, fetchurl, texinfo6_5, libXext, xorgproto, libX11 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc , libXxf86vm, openal, libGLU, libGL }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A game programming library"; homepage = "https://liballeg.org/"; license = licenses.free; # giftware diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix index 1f4dafeb362..9ff83dcec40 100644 --- a/pkgs/development/libraries/alure/default.nix +++ b/pkgs/development/libraries/alure/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openal }: +{ lib, stdenv, fetchurl, cmake, openal }: stdenv.mkDerivation rec { pname = "alure"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ openal ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility library to help manage common tasks with OpenAL applications"; homepage = "https://kcat.strangesoft.net/alure.html"; license = licenses.mit; diff --git a/pkgs/development/libraries/alure2/default.nix b/pkgs/development/libraries/alure2/default.nix index 6da95a77264..fa42c4fd53a 100644 --- a/pkgs/development/libraries/alure2/default.nix +++ b/pkgs/development/libraries/alure2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, openal, libvorbis, opusfile, libsndfile }: +{ lib, stdenv, fetchFromGitHub, cmake, openal, libvorbis, opusfile, libsndfile }: stdenv.mkDerivation rec { pname = "alure2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ openal libvorbis opusfile libsndfile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A utility library for OpenAL, providing a C++ API and managing common tasks that include file loading, caching, and streaming"; homepage = "https://github.com/kcat/alure"; license = licenses.zlib; diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index b4731b608dc..fb48ef73905 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { cmakeDir = "../drivers/xgl"; # LTO is disabled in gcc for i686 as of #66528 - cmakeFlags = stdenv.lib.optionals stdenv.is32bit ["-DXGL_ENABLE_LTO=OFF"]; + cmakeFlags = lib.optionals stdenv.is32bit ["-DXGL_ENABLE_LTO=OFF"]; installPhase = '' install -Dm755 -t $out/lib icd/amdvlk${suffix}.so @@ -83,7 +83,7 @@ in stdenv.mkDerivation rec { # Keep the rpath, otherwise vulkaninfo and vkcube segfault dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "AMD Open Source Driver For Vulkan"; homepage = "https://github.com/GPUOpen-Drivers/AMDVLK"; changelog = "https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-${version}"; diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/development/libraries/aml/default.nix index 8b4eccb9fff..899dafde76f 100644 --- a/pkgs/development/libraries/aml/default.nix +++ b/pkgs/development/libraries/aml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, pkg-config, ninja }: +{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja }: stdenv.mkDerivation rec { pname = "aml"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson pkg-config ninja ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Another main loop"; inherit (src.meta) homepage; license = licenses.isc; diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix index 4e8aab263eb..b226c9e36d2 100644 --- a/pkgs/development/libraries/amrnb/default.nix +++ b/pkgs/development/libraries/amrnb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { name = "amrnb-11.0.0.0"; @@ -26,6 +26,6 @@ stdenv.mkDerivation { # The wrapper code is free, but not the libraries from 3gpp. # It's a source code reference implementation with patents and licenses on # some countries, not redistributable. - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix index e6581d54911..776065b28bc 100644 --- a/pkgs/development/libraries/amrwb/default.nix +++ b/pkgs/development/libraries/amrwb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "amrwb"; @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { # The wrapper code is free, but not the libraries from 3gpp. # It's a source code reference implementation with patents and licenses on # some countries, not redistributable. - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 300069e60ae..f144f847bcf 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , gtk3 , pkg-config @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "5.2.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0y3hmmflw4i0y0yb9a8rlihbv3cbwnvdcf1n5jycwzpq9jxla1c2"; }; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gnome3.updateScript { packageName = pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Amtk"; description = "Actions, Menus and Toolbars Kit for GTK applications"; maintainers = [ maintainers.manveru ]; diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 8490541546b..976387d49eb 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "apache-activemq"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://activemq.apache.org/"; description = "Messaging and Integration Patterns server written in Java"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index a5b4c0cad48..1cd9fb2c8b7 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , substituteAll , docbook_xml_dtd_42 @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "hughsie"; repo = "appstream-glib"; - rev = stdenv.lib.replaceStrings [ "." "-" ] [ "_" "_" ] name; + rev = lib.replaceStrings [ "." "-" ] [ "_" "_" ] name; sha256 = "12s7d3nqjs1fldnppbg2mkjg4280f3h8yzj3q1hiz3chh1w0vjbx"; }; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { moveToOutput "share/installed-tests" "$installedTests" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Objects and helper methods to read and write AppStream metadata"; homepage = "https://people.freedesktop.org/~hughsient/appstream-glib/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 3764d1e7f86..1e3c2bcd2eb 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, gettext +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gettext , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection , pcre, itstool, gperf, vala, lmdb, libsoup @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "-Dvapi=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Software metadata handling library"; homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; longDescription = '' diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index ba12e2d0385..51e9271b7d7 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, apr, expat, gnused +{ lib, stdenv, fetchurl, makeWrapper, apr, expat, gnused , sslSupport ? true, openssl , bdbSupport ? true, db , ldapSupport ? !stdenv.isCygwin, openldap @@ -10,7 +10,7 @@ assert sslSupport -> openssl != null; assert bdbSupport -> db != null; assert ldapSupport -> openldap != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "apr-util-1.6.1"; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { inherit sslSupport bdbSupport ldapSupport; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://apr.apache.org/"; description = "A companion library to APR, the Apache Portable Runtime"; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index ce33c0534fa..c7a1073d137 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "apr-1.7.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; # This test needs the net postPatch = '' @@ -23,22 +23,22 @@ stdenv.mkDerivation rec { configureFlagsArray+=("--with-installbuilddir=$dev/share/build") ''; - configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_file__dev_zero=yes" "ac_cv_func_setpgrp_void=0" "apr_cv_process_shared_works=1" "apr_cv_tcp_nodelay_with_cork=1" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [ + ] ++ lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [ # Including the Windows headers breaks unistd.h. # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2 "ac_cv_header_windows_h=no" ]; - CPPFLAGS=stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED"; + CPPFLAGS=lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED"; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://apr.apache.org/"; description = "The Apache Portable Runtime library"; platforms = platforms.all; diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index ab5ff960e98..1e11661b009 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, gwenhywfar, libtool, libxml2, libxslt +{ lib, stdenv, fetchurl, gmp, gwenhywfar, libtool, libxml2, libxslt , pkg-config, gettext, xmlsec, zlib }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An interface to banking tasks, file formats and country information"; homepage = "https://www.aquamaniac.de/"; hydraPlatforms = []; diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 660f3bf377e..d240e7e3a9d 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkg-config, gettext +{ lib, stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkg-config, gettext , which # GUI support @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { isRelative = path: builtins.substring 0 1 path != "/"; mkSearchPath = path: '' p; g; s,\,"${path}",g; - '' + stdenv.lib.optionalString (isRelative path) '' + '' + lib.optionalString (isRelative path) '' s/AddPath(\(.*\));/AddRelPath(\1, GWEN_PathManager_RelModeHome);/g ''; @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { sed -i -e '/GWEN_PathManager_DefinePath.*GWEN_PM_PLUGINDIR/,/^#endif/ { /^#if/,/^#endif/ { H; /^#endif/ { - ${stdenv.lib.concatMapStrings mkSearchPath pluginSearchPaths} + ${lib.concatMapStrings mkSearchPath pluginSearchPaths} } } }' src/gwenhywfar.c @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpgerror ]; - meta = with stdenv.lib; { + meta = with lib; { description = "OS abstraction functions used by aqbanking and related tools"; homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix index c4cf069b04c..f483f232e37 100644 --- a/pkgs/development/libraries/aqbanking/libchipcard.nix +++ b/pkgs/development/libraries/aqbanking/libchipcard.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, gwenhywfar, pcsclite, zlib }: +{ lib, stdenv, fetchurl, pkg-config, gwenhywfar, pcsclite, zlib }: let inherit ((import ./sources.nix).libchipcard) sha256 releaseId version; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-gwen-dir=${gwenhywfar}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for access to chipcards"; homepage = "https://www.aquamaniac.de/rdm/projects/libchipcard"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index 89c8d91f26a..62a5c54e676 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool , audit, glib, libusb1, libxml2 , wrapGAppsHook , gstreamer ? null @@ -19,11 +19,11 @@ let gstreamerAtLeastVersion1 = - stdenv.lib.all - (pkg: pkg != null && stdenv.lib.versionAtLeast (stdenv.lib.getVersion pkg) "1.0") + lib.all + (pkg: pkg != null && lib.versionAtLeast (stdenv.lib.getVersion pkg) "1.0") [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; in - assert enableGstPlugin -> stdenv.lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; + assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; assert enableViewer -> enableGstPlugin; assert enableViewer -> libnotify != null; assert enableViewer -> gnome3 != null; @@ -49,26 +49,26 @@ in pkg-config intltool gtk-doc - ] ++ stdenv.lib.optional enableViewer wrapGAppsHook; + ] ++ lib.optional enableViewer wrapGAppsHook; buildInputs = [ glib libxml2 ] - ++ stdenv.lib.optional enableUsb libusb1 - ++ stdenv.lib.optional enablePacketSocket audit - ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] - ++ stdenv.lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ]; + ++ lib.optional enableUsb libusb1 + ++ lib.optional enablePacketSocket audit + ++ lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] + ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ]; preAutoreconf = ''./autogen.sh''; configureFlags = - stdenv.lib.optional enableUsb "--enable-usb" - ++ stdenv.lib.optional enablePacketSocket "--enable-packet-socket" - ++ stdenv.lib.optional enableViewer "--enable-viewer" - ++ stdenv.lib.optional enableGstPlugin + lib.optional enableUsb "--enable-usb" + ++ lib.optional enablePacketSocket "--enable-packet-socket" + ++ lib.optional enableViewer "--enable-viewer" + ++ lib.optional enableGstPlugin (if gstreamerAtLeastVersion1 then "--enable-gst-plugin" else "--enable-gst-0.10-plugin") - ++ stdenv.lib.optional enableCppTest "--enable-cpp-test" - ++ stdenv.lib.optional enableFastHeartbeat "--enable-fast-heartbeat" - ++ stdenv.lib.optional enableAsan "--enable-asan"; + ++ lib.optional enableCppTest "--enable-cpp-test" + ++ lib.optional enableFastHeartbeat "--enable-fast-heartbeat" + ++ lib.optional enableAsan "--enable-asan"; postPatch = '' ln -s ${gtk-doc}/share/gtk-doc/data/gtk-doc.make . @@ -82,9 +82,9 @@ in Implements the gigabit ethernet and USB3 protocols used by industrial cameras. ''; homepage = "https://aravisproject.github.io/docs/aravis-0.5"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; maintainers = []; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index b17ef73a5cf..1c356b59d8a 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}: +{lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}: stdenv.mkDerivation rec { pname = "arb"; version = "2.17.0"; @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { "--with-flint=${flint}" ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for arbitrary-precision interval arithmetic"; homepage = "https://arblib.org/"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; maintainers = teams.sage.members; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix index f961c577aa7..33b253718a7 100644 --- a/pkgs/development/libraries/argp-standalone/default.nix +++ b/pkgs/development/libraries/argp-standalone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: let patch-argp-fmtstream = fetchpatch { @@ -28,12 +28,12 @@ stdenv.mkDerivation { }; patches = - stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ patch-argp-fmtstream ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isLinux [ patch-throw-in-funcdef patch-shared ]; + lib.optionals stdenv.hostPlatform.isDarwin [ patch-argp-fmtstream ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ patch-throw-in-funcdef patch-shared ]; - patchFlags = stdenv.lib.optional stdenv.hostPlatform.isDarwin "-p0"; + patchFlags = lib.optional stdenv.hostPlatform.isDarwin "-p0"; - preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline'"; + preConfigure = lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline'"; postInstall = '' mkdir -p $out/lib $out/include @@ -47,7 +47,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.lysator.liu.se/~nisse/misc/"; description = "Standalone version of arguments parsing functions from GLIBC"; platforms = with platforms; darwin ++ linux; diff --git a/pkgs/development/libraries/argtable/default.nix b/pkgs/development/libraries/argtable/default.nix index bf953d87fe2..a16885ab254 100644 --- a/pkgs/development/libraries/argtable/default.nix +++ b/pkgs/development/libraries/argtable/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patchShebangs tools/build ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://argtable.org"; description = "A single-file, ANSI C command-line parsing library"; longDescription = '' diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix index cb0c65e97e3..85dafde83c2 100644 --- a/pkgs/development/libraries/arguments/default.nix +++ b/pkgs/development/libraries/arguments/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "arguments"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = false; # internal_volume_io.h: No such file or directory - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/${owner}/${pname}"; description = "Library for argument handling for MINC programs"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/aribb25/default.nix b/pkgs/development/libraries/aribb25/default.nix index 949fd401f5d..3e171d75797 100644 --- a/pkgs/development/libraries/aribb25/default.nix +++ b/pkgs/development/libraries/aribb25/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { buildFlags = lib.optional stdenv.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://code.videolan.org/videolan/aribb25"; description = "Sample implementation of the ARIB STD-B25 standard"; platforms = platforms.all; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 12f6316537b..6696e5720e3 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, blas, lapack, superlu, hdf5 }: +{ lib, stdenv, fetchurl, cmake, blas, lapack, superlu, hdf5 }: stdenv.mkDerivation rec { pname = "armadillo"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ ./use-unix-config-on-OS-X.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ linear algebra library"; homepage = "http://arma.sourceforge.net"; license = licenses.asl20; diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index c9a09ac115c..c636d672332 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config , opencl-clhpp, ocl-icd, fftw, fftwFloat , blas, lapack, boost, mesa, libGLU, libGL , freeimage, python, clfft, clblas @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "-DAF_BUILD_OPENCL=OFF" "-DAF_BUILD_EXAMPLES=OFF" "-DBUILD_TESTING=OFF" - ] ++ stdenv.lib.optional cudaSupport "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs"; + ] ++ lib.optional cudaSupport "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs"; patches = [ ./no-download.patch ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { cp -R --no-preserve=mode,ownership ${opencl-clhpp}/include/CL/cl2.hpp ./build/include/CL/cl2.hpp ''; - preBuild = stdenv.lib.optionalString cudaSupport '' + preBuild = lib.optionalString cudaSupport '' export CUDA_PATH="${cudatoolkit}" ''; @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { libGLU libGL mesa freeimage boost.out boost.dev - ] ++ (stdenv.lib.optional stdenv.isLinux ocl-icd) - ++ (stdenv.lib.optional cudaSupport cudatoolkit) - ++ (stdenv.lib.optional buildDocs doxygen); + ] ++ (lib.optional stdenv.isLinux ocl-icd) + ++ (lib.optional cudaSupport cudatoolkit) + ++ (lib.optional buildDocs doxygen); - meta = with stdenv.lib; { + meta = with lib; { description = "A general-purpose library for parallel and massively-parallel computations"; longDescription = '' A general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices."; diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix index d83a48e61b8..8bcc12ae2b3 100644 --- a/pkgs/development/libraries/asio/generic.nix +++ b/pkgs/development/libraries/asio/generic.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl, boost, openssl +{lib, stdenv, fetchurl, boost, openssl , version, sha256, ... }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "asio"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { homepage = "http://asio.sourceforge.net/"; description = "Cross-platform C++ library for network and low-level I/O programming"; license = licenses.boost; - broken = stdenv.isDarwin && stdenv.lib.versionOlder version "1.16.1"; + broken = stdenv.isDarwin && lib.versionOlder version "1.16.1"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 68faef7e786..01acced98f6 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, fetchzip, perl +{ lib, stdenv, fetchurl, fetchpatch, fetchzip, perl , searchNixProfiles ? true }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr"; }; - patches = stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; + patches = lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; postPatch = '' patch interfaces/cc/aspell.h < ${./clang.patch} @@ -51,8 +51,8 @@ stdenv.mkDerivation rec { meta = { description = "Spell checker for many languages"; homepage = "http://aspell.net/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; maintainers = [ ]; - platforms = with stdenv.lib.platforms; all; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index d40f4b5aae4..3923416c4a3 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -49,7 +49,7 @@ let meta = { description = "Aspell dictionary for ${fullName}"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; } // (args.meta or {}); } // removeAttrs args [ "meta" ]); diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 9c5b75999f1..a2cd3a2a457 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, zlib }: stdenv.mkDerivation rec { pname = "assimp"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to import various 3D model formats"; homepage = "http://assimp.sourceforge.net/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index c638c4b2a40..1e5a1d3fd64 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version = "2.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "z6AIpa+CKzauYofxgYLEDJHdaZxV+qOGBYge0XXKRk8="; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)"; homepage = "https://gitlab.gnome.org/GNOME/at-spi2-atk"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 2d3e96639c7..7e1181cf3bd 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { version = "2.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "hONsP+ZoYhM/X+Ipdyt2qiUm4Q3lAUo3ePL6Rs5VDaU="; }; @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { postFixup = '' # Cannot use wrapGAppsHook'due to a dependency cycle wrapProgram $out/libexec/at-spi-bus-launcher \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; homepage = "https://gitlab.gnome.org/GNOME/at-spi2-core"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index e962eac0092..4cb2d6b2aec 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib +{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib , fixDarwinDylibNames, gobject-introspection, gnome3 }: @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv"; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ # Required by atk.pc @@ -52,10 +52,10 @@ stdenv.mkDerivation rec { homepage = "http://library.gnome.org/devel/atk/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index 1e6f047b6aa..e9c63eb650f 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, atk, glibmm, pkg-config, gnome3 }: +{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome3 }: stdenv.mkDerivation rec { pname = "atkmm"; version = "2.28.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c"; }; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "C++ wrappers for ATK accessibility toolkit"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; homepage = "https://gtkmm.org"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index d69d475f737..b7c9287b68b 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext }: +{ lib, stdenv, fetchurl, gettext }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://savannah.nongnu.org/projects/attr/"; description = "Library and tools for manipulating extended attributes"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 0760a1438c0..7aa4859ef0e 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate +{ lib, stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate , libsndfile, pkg-config, python, wafHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python wafHook ]; buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for audio labelling"; homepage = "https://aubio.org/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/audiality2/default.nix b/pkgs/development/libraries/audiality2/default.nix index a311c5f5479..e0ab0accdfd 100644 --- a/pkgs/development/libraries/audiality2/default.nix +++ b/pkgs/development/libraries/audiality2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { jack2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A realtime scripted modular audio engine for video games and musical applications"; homepage = "http://audiality.org"; license = licenses.zlib; diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 593854bb280..2e10dbd8815 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, unzip, fetchurl }: +{ lib, stdenv, unzip, fetchurl }: # Upstream changes files in-place, to update: # 1. Check latest version at http://www.un4seen.com/ @@ -55,7 +55,7 @@ let install -m644 -t $out/include/ ${bass.h} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Shareware audio library"; homepage = "https://www.un4seen.com/"; license = licenses.unfreeRedistributable; @@ -63,4 +63,4 @@ let }; }; -in stdenv.lib.mapAttrs dropBass allBass +in lib.mapAttrs dropBass allBass diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix index 24f4c77e350..11135b14fd4 100644 --- a/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libsndfile }: +{ lib, stdenv, fetchurl, pkg-config, libsndfile }: stdenv.mkDerivation rec { pname = "libbs2b"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://bs2b.sourceforge.net/"; description = "Bauer stereophonic-to-binaural DSP library"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix index d70b6cfbde8..927bd00656e 100644 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromBitbucket, cmake, removeReferencesTo }: +{ lib, stdenv, fetchFromBitbucket, cmake, removeReferencesTo }: let version = "0.6.3"; in stdenv.mkDerivation { pname = "libgme"; inherit version; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of video game music chip emulators"; homepage = "https://bitbucket.org/mpyne/game-music-emu/overview"; license = licenses.lgpl21; @@ -26,7 +26,7 @@ in stdenv.mkDerivation { # it doesn't. disallowedReferences = [ stdenv.cc.cc ]; - postFixup = stdenv.lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.isLinux '' remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/lib/libgme.so)" ''; } diff --git a/pkgs/development/libraries/audio/libinstpatch/default.nix b/pkgs/development/libraries/audio/libinstpatch/default.nix index 3968794d2dc..29781446c8f 100644 --- a/pkgs/development/libraries/audio/libinstpatch/default.nix +++ b/pkgs/development/libraries/audio/libinstpatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, glib, libsndfile }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, libsndfile }: stdenv.mkDerivation rec { pname = "libinstpatch"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "-DLIB_SUFFIX=" # Install in $out/lib. ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.swamiproject.org/"; description = "MIDI instrument patch files support library"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index c2b2725c19c..9c636e0205d 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib }: stdenv.mkDerivation rec { pname = "libmysofa"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCODE_COVERAGE=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Reader for AES SOFA files to get better HRTFs"; homepage = "https://github.com/hoene/libmysofa"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index a3d76e55e36..0c173a6a99e 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, glib, pkg-config }: +{ lib, stdenv, fetchurl, autoreconfHook, glib, pkg-config }: stdenv.mkDerivation rec { version = "1.3"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library for reading and writing Standard MIDI Files"; homepage = "https://github.com/stump/libsmf"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 1e126654bba..79f09f48464 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook }: +{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook }: stdenv.mkDerivation rec { pname = "lilv"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://drobilla.net/software/lilv"; description = "A C library to make the use of LV2 plugins"; license = licenses.mit; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index 3005a4398f9..45caf0b36c5 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, libsndfile, pkg-config, python3, wafHook }: +{ lib, stdenv, fetchurl, gtk2, libsndfile, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "lv2"; @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ gtk2 libsndfile python3 ]; - wafConfigureFlags = stdenv.lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ]; + wafConfigureFlags = lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://lv2plug.in"; description = "A plugin standard for audio systems"; license = licenses.mit; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index e497816bf1c..cecae743da0 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python, wafHook }: +{ lib, stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python, wafHook }: stdenv.mkDerivation rec { pname = "lvtk"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--boost-libs=${boost.out}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A set C++ wrappers around the LV2 C API"; homepage = "https://lvtk.org/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/audio/mbelib/default.nix b/pkgs/development/libraries/audio/mbelib/default.nix index 993bbcd09c1..f13f6d7063c 100644 --- a/pkgs/development/libraries/audio/mbelib/default.nix +++ b/pkgs/development/libraries/audio/mbelib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "mbelib"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD ''; - meta = with stdenv.lib; { + meta = with lib; { description = "P25 Phase 1 and ProVoice vocoder"; homepage = https://github.com/szechyjs/mbelib; license = licenses.isc; diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index e2f20d46a3d..ecb0215a228 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python2, wafHook }: +{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python2, wafHook }: stdenv.mkDerivation rec { pname = "ntk"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { description = "Fork of FLTK 1.3.0 with additional functionality"; version = version; homepage = "http://non.tuxfamily.org/"; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ magnetophon nico202 ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ magnetophon nico202 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/audio/qm-dsp/default.nix b/pkgs/development/libraries/audio/qm-dsp/default.nix index a93b031a4d1..3d8e15f97cd 100644 --- a/pkgs/development/libraries/audio/qm-dsp/default.nix +++ b/pkgs/development/libraries/audio/qm-dsp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , kissfft @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${kissfft}/include/kissfft"; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ library of functions for DSP and Music Informatics purposes"; homepage = "https://code.soundsoftware.ac.uk/projects/qm-dsp"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index 1516b6df879..a0089e31044 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, boost, gtk2, pkg-config, python, wafHook }: +{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python, wafHook }: stdenv.mkDerivation rec { pname = "raul"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ boost gtk2 python ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ utility library primarily aimed at audio/musical applications"; homepage = "http://drobilla.net/software/raul"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index 53efa598079..820ea1e49b9 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pulseaudio, rtmidi }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pulseaudio, rtmidi }: stdenv.mkDerivation rec { version = "5.1.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ./configure ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of C++ classes that provide a cross platform API for realtime audio input/output"; homepage = "http://www.music.mcgill.ca/~gary/rtaudio/"; license = licenses.mit; diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index 33a400c2f3d..f6208bab6c6 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkg-config }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkg-config }: stdenv.mkDerivation rec { version = "4.0.0"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "A set of C++ classes that provide a cross platform API for realtime MIDI input/output"; homepage = "http://www.music.mcgill.ca/~gary/rtmidi/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 392c05c02a7..464e79f6c2d 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, wafHook }: +{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, wafHook }: stdenv.mkDerivation rec { pname = "sratom"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ lv2 serd sord ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://drobilla.net/software/sratom"; description = "A library for serialising LV2 atoms to/from RDF"; license = licenses.mit; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 43e5bc8f9cc..0f4dd0f62c4 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ++ (lib.optionals withQt4 [ qt4 ]) ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://drobilla.net/software/suil"; description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; license = licenses.mit; diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix index 9c0a138b309..4d033d99d29 100644 --- a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix +++ b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix @@ -1,7 +1,7 @@ # set VAMP_PATH ? # plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses) -{ stdenv, fetchFromGitHub, pkg-config, libsndfile }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libsndfile }: stdenv.mkDerivation rec { pname = "vamp-plugin-sdk"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; homepage = "https://vamp-plugins.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index c819f355e0b..45f5fcfe3a4 100644 --- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl , alsaLib, }: +{ lib, stdenv, fetchurl , alsaLib, }: stdenv.mkDerivation rec { pname = "zita-alsa-pcmi"; @@ -57,8 +57,8 @@ stdenv.mkDerivation rec { description = "The successor of clalsadrv, provides easy access to ALSA PCM devices"; version = version; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix index 2b7d89b30a1..3b77bf549ca 100644 --- a/pkgs/development/libraries/audio/zita-convolver/default.nix +++ b/pkgs/development/libraries/audio/zita-convolver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fftwFloat }: +{ lib, stdenv, fetchurl, fftwFloat }: stdenv.mkDerivation rec { pname = "zita-convolver"; @@ -22,15 +22,15 @@ stdenv.mkDerivation rec { postInstall = '' # create lib link for building apps - ln -s $out/lib/libzita-convolver.so.${version} $out/lib/libzita-convolver.so.${stdenv.lib.versions.major version} + ln -s $out/lib/libzita-convolver.so.${version} $out/lib/libzita-convolver.so.${lib.versions.major version} ''; meta = { description = "Convolution library by Fons Adriaensen"; version = version; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 2881e566218..88e81d733b3 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "zita-resampler"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { description = "Resample library by Fons Adriaensen"; version = version; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 86531a6ad25..88b1840955d 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { name = "audiofile-0.3.6"; buildInputs = - stdenv.lib.optionals stdenv.isLinux [ + lib.optionals stdenv.isLinux [ alsaLib - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit ]; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for reading and writing audio files in various formats"; homepage = "http://www.68k.org/~michael/audiofile/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index ca832816eab..dd54ba79db7 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, pkg-config, libdaemon, dbus, perlPackages +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, libdaemon, dbus, perlPackages , expat, gettext, intltool, glib, libiconv, writeShellScriptBin, libevent , gtk3Support ? false, gtk3 ? null , qt4 ? null @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { - name = "avahi${stdenv.lib.optionalString withLibdnssdCompat "-compat"}-${version}"; + name = "avahi${lib.optionalString withLibdnssdCompat "-compat"}-${version}"; version = "0.8"; src = fetchurl { @@ -36,32 +36,32 @@ stdenv.mkDerivation rec { buildInputs = [ libdaemon dbus glib expat libiconv libevent ] ++ (with perlPackages; [ perl XMLParser ]) - ++ (stdenv.lib.optional gtk3Support gtk3) - ++ (stdenv.lib.optional qt4Support qt4) - ++ (stdenv.lib.optional qt5Support qt5); + ++ (lib.optional gtk3Support gtk3) + ++ (lib.optional qt4Support qt4) + ++ (lib.optional qt5Support qt5); propagatedBuildInputs = - stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]); + lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]); nativeBuildInputs = [ pkg-config pkg-config-helper gettext intltool glib ]; configureFlags = [ "--disable-qt3" "--disable-gdbm" "--disable-mono" "--disable-gtk" "--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d" - (stdenv.lib.enableFeature gtk3Support "gtk3") + (lib.enableFeature gtk3Support "gtk3") "--${if qt4Support then "enable" else "disable"}-qt4" "--${if qt5Support then "enable" else "disable"}-qt5" - (stdenv.lib.enableFeature withPython "python") + (lib.enableFeature withPython "python") "--localstatedir=/var" "--with-distro=none" # A systemd unit is provided by the avahi-daemon NixOS module "--with-systemdsystemunitdir=no" ] - ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd" + ++ lib.optional withLibdnssdCompat "--enable-compat-libdns_sd" # autoipd won't build on darwin - ++ stdenv.lib.optional stdenv.isDarwin "--disable-autoipd"; + ++ lib.optional stdenv.isDarwin "--disable-autoipd"; NIX_CFLAGS_COMPILE = "-DAVAHI_SERVICE_DIR=\"/etc/avahi/services\""; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.isDarwin '' sed -i '20 i\ #define __APPLE_USE_RFC_2292' \ avahi-core/socket.c @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { postInstall = # Maintain compat for mdnsresponder and howl - stdenv.lib.optionalString withLibdnssdCompat '' + lib.optionalString withLibdnssdCompat '' ln -s avahi-compat-libdns_sd/dns_sd.h "$out/include/dns_sd.h" ''; /* # these don't exist (anymore?) @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc */ - meta = with stdenv.lib; { + meta = with lib; { description = "mDNS/DNS-SD implementation"; homepage = "http://avahi.org"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index 9ac609f1679..15e2516c1b6 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost, python2}: +{ lib, stdenv, fetchurl, cmake, boost, python2}: let version = "1.8.2"; in @@ -22,8 +22,8 @@ stdenv.mkDerivation { meta = { description = "A C++ library which implements parts of the Avro Specification"; homepage = "https://avro.apache.org/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ rasendubi ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ rasendubi ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index b0dfd52ab16..a5acd7c7898 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchurl, pkg-config, jansson, zlib }: +{ lib, stdenv, cmake, fetchurl, pkg-config, jansson, zlib }: let version = "1.9.1"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation { buildInputs = [ jansson zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library which implements parts of the Avro Specification"; homepage = "https://avro.apache.org/"; license = licenses.asl20; diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/development/libraries/ayatana-ido/default.nix index 127fe1c9750..60417426f76 100644 --- a/pkgs/development/libraries/ayatana-ido/default.nix +++ b/pkgs/development/libraries/ayatana-ido/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkg-config, autoreconfHook , gtk3, gobject-introspection, gtk-doc, vala }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Ayatana Display Indicator Objects"; homepage = "https://github.com/AyatanaIndicators/ayatana-ido"; changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog"; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index ef24f0dadb7..6e3a5abaaa6 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "sha256-5+OLhEH3f+udyCMctDSoYZCiHy82ksKBRX6Z016cNOo="; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { lcms2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Image pixel format conversion library"; homepage = "https://gegl.org/babl/"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index e7d8daf4d28..95d54993e06 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , pantheon , autoconf , automake @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - meta = with stdenv.lib; { + meta = with lib; { description = "Application matching framework"; longDescription = '' Removes the headache of applications matching diff --git a/pkgs/development/libraries/bcg729/default.nix b/pkgs/development/libraries/bcg729/default.nix index f178c192de5..125512c3fed 100644 --- a/pkgs/development/libraries/bcg729/default.nix +++ b/pkgs/development/libraries/bcg729/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , cmake }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Opensource implementation of both encoder and decoder of the ITU G729 Annex A/B speech codec"; homepage = "https://linphone.org/technical-corner/bcg729"; changelog = "https://gitlab.linphone.org/BC/public/bcg729/raw/${version}/NEWS"; diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 655d3a5808a..dd72b7eb41d 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -2,7 +2,7 @@ , cmake , fetchFromGitLab , mbedtls -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Utilities library for Linphone"; homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix index 2433edbfe8f..6b86fca868f 100644 --- a/pkgs/development/libraries/beecrypt/default.nix +++ b/pkgs/development/libraries/beecrypt/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, m4}: +{lib, stdenv, fetchurl, m4}: stdenv.mkDerivation { name = "beecrypt-4.2.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { configureFlags = [ "--disable-optimized" "--enable-static" ]; meta = { - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl2; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 29618623bbf..8e8e455e59a 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ''; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://cgit.freedesktop.org/beignet/"; description = "OpenCL Library for Intel Ivy Bridge and newer GPUs"; longDescription = '' diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index df4e5329018..03f6e96e187 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -2,7 +2,7 @@ , belr , cmake , fetchFromGitLab -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library to manipulate VCard standard format"; homepage = "https://gitlab.linphone.org/BC/public/belcard"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 8a028b5e0a0..e08fc1ae3ee 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -4,7 +4,7 @@ , fetchFromGitLab , libantlr3c , mbedtls -, stdenv +, lib, stdenv , zlib }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://linphone.org/technical-corner/belle-sip"; description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index ab3df9bae7e..b38757525ab 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -1,7 +1,7 @@ { bctoolbox , cmake , fetchFromGitLab -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Belledonne Communications' language recognition library"; homepage = "https://gitlab.linphone.org/BC/public/belr"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix index 5286359b946..74a938cf2a5 100644 --- a/pkgs/development/libraries/biblesync/default.nix +++ b/pkgs/development/libraries/biblesync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, cmake, libuuid }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, libuuid }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libuuid ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.crosswire.org/BibleSync"; description = "A multicast protocol to Bible software shared conavigation"; longDescription = '' @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { ''; license = licenses.publicDomain; maintainers = [ maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index 5473801f85d..06c7ac81dcd 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, icmake +{ lib, stdenv, fetchFromGitLab, icmake , libmilter, libX11, openssl, readline , util-linux, yodl }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ./build install x ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Brokken's Own Base Classes And Templates"; homepage = "https://fbb-git.gitlab.io/bobcat/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix index cb2b24f580b..13f490af3e2 100644 --- a/pkgs/development/libraries/boehm-gc/7.6.6.nix +++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; separateDebugInfo = stdenv.isLinux; - preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' + preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" ''; @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { license = "https://hboehm.info/gc/license.txt"; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 1af63a2e426..85ae01036ed 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; - preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' + preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" ''; @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { license = "https://hboehm.info/gc/license.txt"; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index a056ece56e9..b3d754fb542 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config }: +{ lib, stdenv, fetchurl, pkg-config }: let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "Library for operations on boolean expression binary trees"; homepage = "${baseurl}/boolstuff.html"; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix index 92e02c6ca08..97e87980952 100644 --- a/pkgs/development/libraries/boost-process/default.nix +++ b/pkgs/development/libraries/boost-process/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "boost-process-0.5"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { cp -r boost $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.highscore.de/boost/process0.5/"; description = "Library to manage system processes"; license = licenses.boost; diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix index 31f545ab12b..29993ed02b8 100644 --- a/pkgs/development/libraries/boost/1.67.nix +++ b/pkgs/development/libraries/boost/1.67.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ lib, stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // { version = "1.67.0"; @@ -9,7 +9,7 @@ callPackage ./generic.nix (args // { sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h"; stripLen = 1; }) - ] ++ stdenv.lib.optionals stdenv.cc.isClang [ + ] ++ lib.optionals stdenv.cc.isClang [ # Fixes https://github.com/boostorg/atomic/issues/15 (fetchpatch { url = "https://github.com/boostorg/atomic/commit/6e14ca24dab50ad4c1fa8c27c7dd6f1cb791b534.patch"; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index ec3a28e2b1a..5a2b437d41d 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv +{ lib, stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv , fetchpatch , which , buildPackages @@ -30,9 +30,9 @@ assert enablePython -> stdenv.hostPlatform == stdenv.buildPlatform; assert enableNumpy -> enablePython; # Boost <1.69 can't be build with clang >8, because pth was removed -assert with stdenv.lib; ((toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69")); +assert with lib; ((toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69")); -with stdenv.lib; +with lib; let variant = concatStringsSep "," @@ -150,7 +150,7 @@ stdenv.mkDerivation { EOF ''; - NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin + NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin "-headerpad_max_install_names"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix index a1924f59a8d..f2136296204 100644 --- a/pkgs/development/libraries/bootil/default.nix +++ b/pkgs/development/libraries/bootil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, premake4 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, premake4 }: stdenv.mkDerivation { name = "bootil-unstable-2015-12-17"; @@ -7,9 +7,9 @@ stdenv.mkDerivation { description = "Garry Newman's personal utility library"; homepage = "https://github.com/garrynewman/bootil"; # License unsure - see https://github.com/garrynewman/bootil/issues/21 - license = stdenv.lib.licenses.free; - maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.free; + maintainers = [ lib.maintainers.abigailbuccaneer ]; + platforms = lib.platforms.all; # Build uses `-msse` and `-mfpmath=sse` badPlatforms = [ "aarch64-linux" ]; }; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index eb13321523d..7019d39b16c 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, perl, go }: +{ lib, stdenv, fetchgit, cmake, perl, go }: # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md stdenv.mkDerivation { @@ -29,7 +29,7 @@ stdenv.mkDerivation { outputs = [ "out" "bin" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Free TLS/SSL implementation"; homepage = "https://boringssl.googlesource.com"; platforms = platforms.all; diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 173f074ead7..0369f603b8e 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost +{ lib, stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost # Passed by version specific builders , baseVersion, revision, sha256 , sourceExtension ? "tar.xz" @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { inherit postPatch; buildInputs = [ python bzip2 zlib gmp openssl boost ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; configurePhase = '' python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" } @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ln -s botan-*.pc botan.pc || true ''; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Cryptographic algorithms library"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index e93d4b549a2..47a1c0917f0 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto +{ lib, stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto , libXi, pkg-config }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --replace 'b2_maxPolygonVertices 8' 'b2_maxPolygonVertices 15' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "2D physics engine"; homepage = "https://box2d.org/"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/development/libraries/boxfort/default.nix index 9a4e2c23356..740e4321698 100644 --- a/pkgs/development/libraries/boxfort/default.nix +++ b/pkgs/development/libraries/boxfort/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, python37Packages }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, python37Packages }: stdenv.mkDerivation rec { version = "unstable-2019-10-09"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Convenient & cross-platform sandboxing C library"; homepage = "https://github.com/Snaipe/BoxFort"; license = licenses.mit; diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix index cc5564d4bb7..eb46ccc8cd7 100644 --- a/pkgs/development/libraries/brigand/default.nix +++ b/pkgs/development/libraries/brigand/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation { pname = "brigand"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Instant compile time C++ 11 metaprogramming library"; longDescription = '' Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library. diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index d025b8c28ed..a333a69ffa1 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison }: +{ lib, stdenv, fetchurl, bison }: stdenv.mkDerivation rec { name = "buddy-2.4"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Binary decision diagram package"; license = "as-is"; - platforms = stdenv.lib.platforms.unix; # Once had cygwin problems - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.unix; # Once had cygwin problems + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 07222f469d1..50bf56bfbd2 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut +{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut , Cocoa, OpenGL }: @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] + ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; patches = [ ./gwen-narrowing.patch ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt ''; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" "-DINSTALL_EXTRA_LIBS=ON" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "-DOPENGL_FOUND=true" "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework" "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework" @@ -38,10 +38,10 @@ stdenv.mkDerivation rec { "-DBUILD_UNIT_TESTS=OFF" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=argument-outside-range -Wno-error=c++11-narrowing"; - meta = with stdenv.lib; { + meta = with lib; { description = "A professional free 3D Game Multiphysics Library"; longDescription = '' Bullet 3D Game Multiphysics Library provides state of the art collision diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index 1387048070f..a3966eaa4a3 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut +{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut , Cocoa, OpenGL }: @@ -18,12 +18,12 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] + ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; patches = [ ./gwen-narrowing.patch ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt ''; @@ -32,7 +32,7 @@ stdenv.mkDerivation { "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" "-DINSTALL_EXTRA_LIBS=ON" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "-DOPENGL_FOUND=true" "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework" "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework" @@ -42,7 +42,7 @@ stdenv.mkDerivation { "-DBUILD_UNIT_TESTS=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A professional free 3D Game Multiphysics Library"; longDescription = '' Bullet 3D Game Multiphysics Library provides state of the art collision diff --git a/pkgs/development/libraries/bulletml/default.nix b/pkgs/development/libraries/bulletml/default.nix index f64090bd53a..3da05302ac9 100644 --- a/pkgs/development/libraries/bulletml/default.nix +++ b/pkgs/development/libraries/bulletml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, bison, perl }: +{ lib, stdenv, fetchpatch, fetchurl, bison, perl }: let version = "0.0.6"; @@ -58,7 +58,7 @@ in stdenv.mkDerivation { install -m 644 README.en "$out"/share/licenses/libbulletml ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library to handle BulletML easily"; longDescription = '' BulletML is the Bullet Markup Language. BulletML can describe the barrage diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index ff9e6aa038f..f3f09497a66 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl }: +{ lib, stdenv, fetchurl, tcl }: stdenv.mkDerivation rec { pname = "bwidget"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://sourceforge.net/projects/tcllib"; description = "High-level widget set for Tcl/Tk"; - license = stdenv.lib.licenses.tcltk; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.tcltk; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 3eb99549246..0adcb327cc4 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -2,7 +2,7 @@ , cmake , fetchFromGitLab , sqlite -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; - meta = with stdenv.lib; { + meta = with lib; { description = "An opensource implementation of ZRTP keys exchange protocol"; homepage = "https://gitlab.linphone.org/BC/public/bzrtp"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index ac0dc43c67a..20bcf80d9e5 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeTextDir }: +{ lib, stdenv, fetchurl, writeTextDir }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0h7wjfnk2092glqcp9mqaax7xx0s13m501z1gi0gsjl2vvvd0gfp"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library for asynchronous DNS requests"; homepage = "https://c-ares.haxx.se"; license = licenses.mit; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { set_target_properties(c-ares::cares PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${self}/include" - ${stdenv.lib.optionalString stdenv.isLinux ''INTERFACE_LINK_LIBRARIES "nsl;rt"''} + ${lib.optionalString stdenv.isLinux ''INTERFACE_LINK_LIBRARIES "nsl;rt"''} ) set_property(TARGET c-ares::cares APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(c-ares::cares PROPERTIES diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 7dfcce8e9d8..a7420e300ed 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "c-blosc"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A blocking, shuffling and loss-less compression library"; homepage = "https://www.blosc.org"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 74ca27f2e3c..fdc06df948d 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, openssl }: stdenv.mkDerivation rec { pname = "actor-framework"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source implementation of the actor model in C++"; homepage = "http://actor-framework.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 2eedfbb7b0e..26e37738d55 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,9 +1,9 @@ -{ config, stdenv, fetchurl, fetchpatch, pkg-config, libiconv +{ config, lib, stdenv, fetchurl, fetchpatch, pkg-config, libiconv , libintl, expat, zlib, libpng, pixman, fontconfig, freetype , x11Support? !stdenv.isDarwin, libXext, libXrender , gobjectSupport ? true, glib , xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux) , libGL ? null # libGLU libGL is no longer a big dependency , pdfSupport ? true @@ -14,13 +14,13 @@ assert glSupport -> x11Support && libGL != null; let version = "1.16.0"; - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "cairo"; inherit version; src = fetchurl { - url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; + url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"; }; @@ -78,7 +78,7 @@ in stdenv.mkDerivation rec { preConfigure = # On FreeBSD, `-ldl' doesn't exist. - stdenv.lib.optionalString stdenv.isFreeBSD + lib.optionalString stdenv.isFreeBSD '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in do cat "$i" | sed -es/-ldl//g > t @@ -98,9 +98,9 @@ in stdenv.mkDerivation rec { doCheck = false; # fails - postInstall = stdenv.lib.optionalString stdenv.isDarwin glib.flattenInclude; + postInstall = lib.optionalString stdenv.isDarwin glib.flattenInclude; - meta = with stdenv.lib; { + meta = with lib; { description = "A 2D graphics library with support for multiple output devices"; longDescription = '' diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index cbf9eedc8d5..87b391d2ad0 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx }: +{ fetchurl, lib, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx }: stdenv.mkDerivation rec { pname = "cairomm"; version = "1.12.2"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.cairographics.org/releases/${pname}-${version}.tar.gz"; # gnome doesn't have the latest version ATM; beware: same name but different hash - #url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + #url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"; }; @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ cairo libsigcxx ]; buildInputs = [ fontconfig freetype ] - ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A 2D graphics library with support for multiple output devices"; longDescription = '' diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index ad2517f2589..da6aae64db5 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "capnproto"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "03f1862ljdshg7d0rg3j7jzgm3ip55kzd2y91q7p0racax3hxx6i"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://kentonv.github.io/capnproto"; description = "Cap'n Proto cerealization protocol"; longDescription = '' diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 1e518227035..623021f1dda 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config }: +{ lib, stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { pname = "capstone"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # replace faulty macos detection - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' sed -i 's/^IS_APPLE := .*$/IS_APPLE := 1/' Makefile ''; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { make check ''; - installPhase = (stdenv.lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ") + installPhase = (lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ") + "PREFIX=$out ./make.sh install"; nativeBuildInputs = [ @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = { description = "Advanced disassembly library"; homepage = "http://www.capstone-engine.org"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ris ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thoughtpolice ris ]; }; } diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 36d4960cdcc..2aa5c788dc3 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "catch"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; homepage = "http://catch-lib.net"; license = licenses.boost; diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index 68c16691183..34d61a519ab 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "catch2"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-H.." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; homepage = "http://catch-lib.net"; license = licenses.boost; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index 7813e53a41e..39792d4fd6a 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, ucommon, openssl, libgcrypt }: +{ lib, stdenv, fetchurl, pkg-config, ucommon, openssl, libgcrypt }: stdenv.mkDerivation rec { name = "ccrtp-2.1.2"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of the IETF real-time transport protocol (RTP)"; homepage = "https://www.gnu.org/software/ccrtp/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ marcweber ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index 848927776f9..aff977edd91 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, darwin }: +{ lib, stdenv, fetchFromGitHub, darwin }: stdenv.mkDerivation rec { pname = "cctz"; @@ -13,17 +13,17 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; + buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; installTargets = [ "install_hdrs" "install_shared_lib" ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so ''; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/google/cctz"; description = "C++ library for translating between absolute and civil times"; license = licenses.asl20; diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index 4b745a2a348..9ff54f8ebf9 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gmp , autoreconfHook @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # No actual checks yet (2018-05-05), but maybe one day. # Requested here: https://github.com/cddlib/cddlib/issues/25 doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "An implementation of the Double Description Method for generating all vertices of a convex polyhedron"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index a95e22645cb..1a4f617cf46 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "cdk"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-xBbJh793tPGycD18XkM7qUWMi+Uma/RUy/gBrYfnKTY="; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Curses development kit"; license = licenses.bsdOriginal ; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix index 10e145b34ea..a038b5885c2 100644 --- a/pkgs/development/libraries/cdo/default.nix +++ b/pkgs/development/libraries/cdo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, curl, hdf5, netcdf +{ lib, stdenv, fetchurl, curl, hdf5, netcdf , # build, install and link to a CDI library [default=no] enable_cdi_lib ? false , # build a completely statically linked CDO binary @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { # Configure phase configureFlags = [ "--with-netcdf=${netcdf}" "--with-hdf5=${hdf5}"] - ++ stdenv.lib.optional (enable_cdi_lib) "--enable-cdi-lib" - ++ stdenv.lib.optional (enable_all_static) "--enable-all-static" - ++ stdenv.lib.optional (enable_cxx) "--enable-cxx"; + ++ lib.optional (enable_cdi_lib) "--enable-cdi-lib" + ++ lib.optional (enable_all_static) "--enable-all-static" + ++ lib.optional (enable_cxx) "--enable-cxx"; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data"; longDescription = '' Supported data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and IEG. diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index 7397bdceb76..ba3366198c2 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ogre, freetype, boost, expat }: +{ lib, stdenv, fetchurl, cmake, ogre, freetype, boost, expat }: stdenv.mkDerivation rec { pname = "cegui"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ ogre freetype boost expat ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cegui.org.uk/"; description = "C++ Library for creating GUIs"; license = licenses.mit; diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix index 6277c5cd931..d4fe5e83658 100644 --- a/pkgs/development/libraries/celt/generic.nix +++ b/pkgs/development/libraries/celt/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, version, src +{ lib, stdenv, version, src , liboggSupport ? true, libogg ? null # if disabled only the library will be built , prePatch ? "" , ... @@ -15,11 +15,11 @@ stdenv.mkDerivation { inherit prePatch; buildInputs = [] - ++ stdenv.lib.optional liboggSupport libogg; + ++ lib.optional liboggSupport libogg; doCheck = false; # fails - meta = with stdenv.lib; { + meta = with lib; { description = "Ultra-low delay audio codec"; homepage = "http://www.celt-codec.org/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/cereal/default.nix b/pkgs/development/libraries/cereal/default.nix index e17b42ea5c1..d2321175f8b 100644 --- a/pkgs/development/libraries/cereal/default.nix +++ b/pkgs/development/libraries/cereal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cereal"; version = "1.3.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cmakeFlagsArray = [ "-DJUST_INSTALL_CEREAL=yes" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A header-only C++11 serialization library"; homepage = "https://uscilab.github.io/cereal/"; platforms = platforms.all; diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 18f029c4585..14d0e38f3d9 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , eigen , fetchurl , cmake @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ eigen glog ] - ++ stdenv.lib.optional runTests gflags; + ++ lib.optional runTests gflags; # The Basel BUILD file conflicts with the cmake build directory on # case-insensitive filesystems, eg. darwin. @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library for modeling and solving large, complicated optimization problems"; license = licenses.bsd3; homepage = "http://ceres-solver.org"; diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index 1b7dc58c0d6..28bb0761777 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv +{ fetchurl, lib, stdenv # Optional dependencies , bzip2 ? null }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./darwin-rpath-universal.patch ]; - configureFlags = stdenv.lib.optional (bzip2 != null) "--with-bzip2=${bzip2.out}"; + configureFlags = lib.optional (bzip2 != null) "--with-bzip2=${bzip2.out}"; hardeningDisable = [ "format" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://heasarc.gsfc.nasa.gov/fitsio/"; description = "Library for reading and writing FITS data files"; longDescription = diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix index d6c550a8da8..1bc85d1fcd8 100644 --- a/pkgs/development/libraries/cgui/default.nix +++ b/pkgs/development/libraries/cgui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo, allegro, perl, libX11 }: +{ lib, stdenv, fetchurl, texinfo, allegro, perl, libX11 }: stdenv.mkDerivation rec { pname = "cgui"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "SYSTEM_DIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A multiplatform basic GUI library"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index be000e457c4..37bde1caf43 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv +{ fetchurl, lib, stdenv , CoreServices }: @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { # Test can randomly fail: https://hydra.nixos.org/build/7243912 doCheck = false; - buildInputs = stdenv.lib.optional stdenv.isDarwin CoreServices; + buildInputs = lib.optional stdenv.isDarwin CoreServices; - meta = with stdenv.lib; { + meta = with lib; { description = "Unit testing framework for C"; longDescription = diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 7618476d62a..8290e60a485 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, freeglut, libGLU, libGL, glfw2, glew, libX11, xorgproto +{ lib, stdenv, fetchurl, cmake, freeglut, libGLU, libGL, glfw2, glew, libX11, xorgproto , libXi, libXmu, fetchpatch, libXrandr }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp demo/chipmunk_demos $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast and lightweight 2D game physics library"; homepage = "http://chipmunk2d.net/"; license = licenses.mit; diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix index 9b95fd26444..8971acc7edd 100644 --- a/pkgs/development/libraries/chmlib/default.nix +++ b/pkgs/development/libraries/chmlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { name = "chmlib-0.40a"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.jedrea.com/chmlib"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; description = "A library for dealing with Microsoft ITSS/CHM format files"; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"]; }; diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 12f844aa595..599ef02eec0 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://acoustid.org/chromaprint"; description = "AcoustID audio fingerprinting library"; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 61d3996a4f5..eb55178db0d 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "cimg"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A small, open source, C++ toolkit for image processing"; longDescription = '' CImg stands for Cool Image. It is easy to use, efficient and is intended diff --git a/pkgs/development/libraries/civetweb/default.nix b/pkgs/development/libraries/civetweb/default.nix index 4092a9c9c5b..8a3474a491f 100644 --- a/pkgs/development/libraries/civetweb/default.nix +++ b/pkgs/development/libraries/civetweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { meta = { description = "Embedded C/C++ web server"; homepage = "https://github.com/civetweb/civetweb"; - license = [ stdenv.lib.licenses.mit ]; + license = [ lib.licenses.mit ]; }; } diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index aad14bead66..a4b526ea25d 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }: +{lib, stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }: stdenv.mkDerivation rec { version = "1.2.4"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp -ruv c_src doc ebin include priv src $DIR ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tonyrog/cl"; description = "OpenCL binding for Erlang"; license = licenses.mit; diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 68706c7b8d1..ba8961c8f6c 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre }: +{ lib, stdenv, fetchurl, pcre }: let version = "1.0.10"; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.cs.wisc.edu/condor/classad/"; description = "The Classified Advertisements library provides a generic means for matching resources"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index 8b79619dff4..74d167144a9 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python }: +{ lib, stdenv, fetchurl, fetchpatch, python }: stdenv.mkDerivation rec { name = "clearsilver-0.10.5"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast, powerful, and language-neutral HTML template system"; homepage = "http://www.clearsilver.net/"; license = licenses.free; diff --git a/pkgs/development/libraries/clfft/default.nix b/pkgs/development/libraries/clfft/default.nix index 5eb5b842ecf..91267208d2e 100644 --- a/pkgs/development/libraries/clfft/default.nix +++ b/pkgs/development/libraries/clfft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }: +{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }: let version = "2.12.2"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation { buildInputs = [ fftw fftwFloat boost166 opencl-clhpp ocl-icd ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library containing FFT functions written in OpenCL"; longDescription = '' clFFT is a software library containing FFT functions written in OpenCL. diff --git a/pkgs/development/libraries/clipp/default.nix b/pkgs/development/libraries/clipp/default.nix index f7c8f90e868..12b393e597d 100644 --- a/pkgs/development/libraries/clipp/default.nix +++ b/pkgs/development/libraries/clipp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "clipp"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --subst-var version ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Easy to use, powerful and expressive command line argument handling for C++11/14/17"; homepage = "https://github.com/muellan/clipp"; license = licenses.mit; diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/development/libraries/clipper/default.nix index ebb41fde423..9eb34f6b686 100644 --- a/pkgs/development/libraries/clipper/default.nix +++ b/pkgs/development/libraries/clipper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ninja, unzip }: +{ lib, stdenv, fetchurl, cmake, ninja, unzip }: stdenv.mkDerivation rec { version = "6.4.2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja unzip ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A polygon and line clipping and offsetting library (C++, C#, Delphi)"; longDescription = '' The Clipper library performs line & polygon clipping - intersection, union, difference & exclusive-or, diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index 669ce90287b..23bbd84a209 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp }: +{ lib, stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { pname = "cln"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C/C++ library for numbers, a part of GiNaC"; homepage = "https://www.ginac.de/CLN/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index f7a0bd058e7..b2bd2adde43 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ppl, autoreconfHook }: +{ fetchurl, lib, stdenv, ppl, autoreconfHook }: stdenv.mkDerivation rec { name = "cloog-ppl-0.15.11"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # CLooG-PPL is actually a port of GLooG from PolyLib to PPL. homepage = "http://www.cloog.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { make[3]: *** [Box.lo] Error 1 */ - platforms = stdenv.lib.platforms.unix; # Once had cygwin problems + platforms = lib.platforms.unix; # Once had cygwin problems }; } diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix index b0f69d42e8c..c952c1a563b 100644 --- a/pkgs/development/libraries/cloog/0.18.0.nix +++ b/pkgs/development/libraries/cloog/0.18.0.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gmp, isl }: +{ fetchurl, lib, stdenv, gmp, isl }: stdenv.mkDerivation rec { name = "cloog-0.18.0"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = "http://www.cloog.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; /* Leads to an ICE on Cygwin: @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { make[3]: *** [Box.lo] Error 1 */ - platforms = stdenv.lib.platforms.unix; # Once had cygwin problems + platforms = lib.platforms.unix; # Once had cygwin problems }; } diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index be506cdee17..54df2df9d4d 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gmp, isl }: +{ fetchurl, lib, stdenv, gmp, isl }: stdenv.mkDerivation rec { name = "cloog-0.18.4"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "http://www.cloog.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; /* Leads to an ICE on Cygwin: @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { make[3]: *** [Box.lo] Error 1 */ - platforms = stdenv.lib.platforms.unix; # Once had cygwin problems + platforms = lib.platforms.unix; # Once had cygwin problems }; } diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 3776f1eac21..9c1f3c21cd2 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, boost, zlib}: +{lib, stdenv, fetchurl, cmake, boost, zlib}: stdenv.mkDerivation rec { name = "clucene-core-2.3.3.4"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "-DBUILD_CONTRIBS=ON" "-DBUILD_CONTRIBS_LIB=ON" "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-D_CL_HAVE_GCC_ATOMIC_FUNCTIONS=0" "-D_CL_HAVE_NAMESPACES_EXITCODE=0" "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE=0" @@ -30,15 +30,15 @@ stdenv.mkDerivation rec { [ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch ./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch ./Install-contribs-lib.patch - ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ]; + ] ++ lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ]; # fails with "Unable to find executable: # /build/clucene-core-2.3.3.4/build/bin/cl_test" doCheck = false; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; - meta = with stdenv.lib; { + meta = with lib; { description = "Core library for full-featured text search engine"; longDescription = '' CLucene is a high-performance, scalable, cross platform, full-featured, diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index d71d01de9e2..20b0a3b547c 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "clucene-core-0.9.21b"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./gcc6.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Core library for full-featured text search engine"; longDescription = '' CLucene is a high-performance, scalable, cross platform, full-featured, diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 82338818918..264c382338c 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }: +{ fetchurl, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "clutter-gst"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy"; }; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { homepage = "http://www.clutter-project.org/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + maintainers = with lib.maintainers; [ lethalman ]; + platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 15bf0d689f5..902a2af62bd 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkg-config, meson, ninja +{ fetchurl, lib, stdenv, pkg-config, meson, ninja , gobject-introspection, clutter, gtk3, gnome3 }: let @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j"; }; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { description = "Clutter-GTK"; homepage = "http://www.clutter-project.org/"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ lethalman ]; + platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 8644f83a689..002db004dc1 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libGLU, libGL, libX11, libXext, libXfixes +{ lib, stdenv, fetchurl, pkg-config, libGLU, libGL, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib , gobject-introspection, gtk3, gnome3, libinput, libgudev, libxkbcommon }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1rn4cd1an6a9dfda884aqpcwcgq8dgydpqvb19nmagw4b70zlj4b"; }; @@ -52,10 +52,10 @@ stdenv.mkDerivation rec { specific needs. ''; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; homepage = "http://www.clutter-project.org/"; - maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.mesaPlatforms; + maintainers = with lib.maintainers; [ lethalman ]; + platforms = lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/libraries/cm256cc/default.nix b/pkgs/development/libraries/cm256cc/default.nix index eaddcb86f54..b40aea70b41 100644 --- a/pkgs/development/libraries/cm256cc/default.nix +++ b/pkgs/development/libraries/cm256cc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost } : +{ lib, stdenv, fetchFromGitHub, cmake, boost } : stdenv.mkDerivation rec { pname = "cm256cc"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast GF(256) Cauchy MDS Block Erasure Codec in C++"; homepage = "https://github.com/f4exb/cm256cc"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/cmark-gfm/default.nix b/pkgs/development/libraries/cmark-gfm/default.nix index 52a02772268..8a9534365f4 100644 --- a/pkgs/development/libraries/cmark-gfm/default.nix +++ b/pkgs/development/libraries/cmark-gfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cmark-gfm"; version = "0.29.0.gfm.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # tests load the library dynamically which for unknown reason failed doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "GitHub's fork of cmark, a CommonMark parsing and rendering library and program in C"; homepage = "https://github.com/github/cmark-gfm"; maintainers = with maintainers; [ cyplo ]; diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index b132e958f67..6061fd8f912 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { version = "0.29.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$(readlink -f ./src) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "CommonMark parsing and rendering library and program in C"; homepage = "https://github.com/jgm/cmark"; maintainers = [ maintainers.michelk ]; diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index 34678d9b37d..39d4849f380 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "cminpack-1.3.6"; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://devernay.free.fr/hacks/cminpack/cminpack.html"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; description = "Software for solving nonlinear equations and nonlinear least squares problems"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix index 18c1843623f..9bfbc410c00 100644 --- a/pkgs/development/libraries/cmocka/default.nix +++ b/pkgs/development/libraries/cmocka/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake }: +{ fetchurl, lib, stdenv, cmake }: stdenv.mkDerivation rec { pname = "cmocka"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight library to simplify and generalize unit tests for C"; longDescription = diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix index a391f604875..43d73ba200c 100644 --- a/pkgs/development/libraries/cmrt/default.nix +++ b/pkgs/development/libraries/cmrt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkg-config, libdrm, libva }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libdrm, libva }: stdenv.mkDerivation rec { pname = "cmrt"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm libva ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://01.org/linuxmedia"; description = "Intel C for Media Runtime"; longDescription = "Media GPU kernel manager for Intel G45 & HD Graphics family"; diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 4a648b1f32a..09ec21cc63e 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "codec2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Speech codec designed for communications quality speech at low data rates"; homepage = "http://www.rowetel.com/blog/?page_id=452"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 10f732dc629..8fd15207287 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl , pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3 , mesa, automake, autoconf , gstreamerSupport ? true, gst_all_1 }: @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { version = "1.22.8"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8"; }; @@ -40,20 +40,20 @@ in stdenv.mkDerivation rec { "--enable-kms-egl-platform" "--enable-wayland-egl-platform" "--enable-wayland-egl-server" - ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst" - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; + ] ++ lib.optional gstreamerSupport "--enable-cogl-gst" + ++ lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; propagatedBuildInputs = with xorg; [ glib gdk-pixbuf gobject-introspection wayland mesa libGL libXrandr libXfixes libXcomposite libXdamage ] - ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer + ++ lib.optionals gstreamerSupport [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; - buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; + buildInputs = lib.optionals pangoSupport [ pango cairo ]; COGL_PANGO_DEP_CFLAGS - = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) + = lib.optionalString (stdenv.isDarwin && pangoSupport) "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; #doCheck = true; # all tests fail (no idea why) @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A small open source library for using 3D graphics hardware for rendering"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index c76aaa4c8e5..3fe78e6d02e 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, boost, cmake, libX11, libGL, libGLU }: +{ fetchFromGitHub, lib, stdenv, boost, cmake, libX11, libGL, libGLU }: stdenv.mkDerivation rec { pname = "coin"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost libX11 libGL libGLU ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/coin3d/coin"; license = licenses.bsd3; description = "High-level, retained-mode toolkit for effective 3D graphics development"; diff --git a/pkgs/development/libraries/comedilib/default.nix b/pkgs/development/libraries/comedilib/default.nix index 98811b97c87..e42f02407d4 100644 --- a/pkgs/development/libraries/comedilib/default.nix +++ b/pkgs/development/libraries/comedilib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , flex @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Linux-Comedi"; repo = "comedilib"; - rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; sha256 = "0kfs2dw62vjz8j7fgsxq6ky8r8kca726gyklbm6kljvgfh47lyfw"; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The Linux Control and Measurement Device Interface Library"; homepage = "https://github.com/Linux-Comedi/comedilib"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix index d5d9aa75e89..968c395d701 100644 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "concurrencykit"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A library of safe, high-performance concurrent data structures"; homepage = "http://concurrencykit.org"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index e084343a94c..dfe7f777670 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: stdenv.mkDerivation rec { pname = "cpp-hocon"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost curl leatherman ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A C++ port of the Typesafe Config library"; license = licenses.asl20; diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix index 623ab59d3ee..839ddb9b76f 100644 --- a/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: +{ lib, stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: stdenv.mkDerivation { pname = "cpp-ipfs-api"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ curl ]; propagatedBuildInputs = [ nlohmann_json ]; - meta = with stdenv.lib; { + meta = with lib; { description = "IPFS C++ API client library"; homepage = "https://github.com/vasild/cpp-ipfs-api"; license = licenses.mit; diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index e7079ac0386..6085a3c849c 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, openssl }: stdenv.mkDerivation rec { pname = "cpp-netlib"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # Most tests make network GET requests to various websites doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of open-source libraries for high level network programming"; homepage = "https://cpp-netlib.org"; license = licenses.boost; diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 9ab3a261da5..38879342f7a 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { checkFlagsArray = [ "LD_LIBRARY_PATH=$(PWD)" ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Martchus/cpp-utilities"; description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index 7673d257a3e..aceb2d61e38 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pcre, zlib, python, openssl }: +{ lib, stdenv, fetchurl, cmake, pcre, zlib, python, openssl }: stdenv.mkDerivation rec { pname = "cppcms"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "--no-warn-unused-cli" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cppcms.com"; description = "High Performance C++ Web Framework"; platforms = platforms.linux ; diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index 6ad27152b38..98c9c7ecac1 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, sqlite, libmysqlclient, postgresql, unixODBC }: +{ lib, stdenv, fetchurl, cmake, sqlite, libmysqlclient, postgresql, unixODBC }: stdenv.mkDerivation rec { pname = "cppdb"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "--no-warn-unused-cli" ]; NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cppcms.com/sql/cppdb/"; description = "C++ Connectivity library that supports MySQL, PostgreSQL, Sqlite3 databases and generic ODBC drivers"; platforms = platforms.linux ; diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/development/libraries/cpptest/default.nix index 5ed06b99f33..654ad955ae6 100644 --- a/pkgs/development/libraries/cpptest/default.nix +++ b/pkgs/development/libraries/cpptest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "cpptest-2.0.0"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0lpy3f2fjx1srh02myanlp6zfi497whlldcrnij39ghfhm0arcnm"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cpptest.sourceforge.net/"; description = "Simple C++ unit testing framework"; maintainers = with maintainers; [ bosu ]; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index bf65be71575..3cafa1c75d7 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "cppunit"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "19qpqzy66bq76wcyadmi3zahk5v1ll2kig1nvg96zx9padkcdic9"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://freedesktop.org/wiki/Software/cppunit/"; description = "C++ unit testing framework"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/development/libraries/cpputest/default.nix index d219a8e0bec..8e3fadc7f0d 100644 --- a/pkgs/development/libraries/cpputest/default.nix +++ b/pkgs/development/libraries/cpputest/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { version = "4.0"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://cpputest.github.io/"; description = "Unit testing and mocking framework for C/C++"; - platforms = stdenv.lib.platforms.linux ; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.juliendehos ]; + platforms = lib.platforms.linux ; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.juliendehos ]; }; } diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index fdd98cb00bf..9237c3bd307 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zeromq }: +{ lib, stdenv, fetchFromGitHub, cmake, zeromq }: stdenv.mkDerivation rec { pname = "cppzmq"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DCPPZMQ_BUILD_TESTS=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/zeromq/cppzmq"; license = licenses.bsd2; description = "C++ binding for 0MQ"; diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index c10a69d72f9..13029f7739c 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.cracklib; buildInputs = [ zlib gettext ]; - postPatch = stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postPatch = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' chmod +x util/cracklib-format patchShebangs util diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix index c10d218ea42..bc46e80db9b 100644 --- a/pkgs/development/libraries/crc32c/default.nix +++ b/pkgs/development/libraries/crc32c/default.nix @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ gflags ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; cmakeFlags = lib.optionals (!staticOnly) [ "-DBUILD_SHARED_LIBS=1" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/google/crc32c"; description = "CRC32C implementation with support for CPU-specific acceleration instructions"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/libraries/crcpp/default.nix b/pkgs/development/libraries/crcpp/default.nix index c26578804ba..9410b071500 100644 --- a/pkgs/development/libraries/crcpp/default.nix +++ b/pkgs/development/libraries/crcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp inc/CRC.h $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/d-bahr/CRCpp"; description = "Easy to use and fast C++ CRC library"; platforms = platforms.all; diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix index df1837de305..d85843a54f7 100644 --- a/pkgs/development/libraries/cre2/default.nix +++ b/pkgs/development/libraries/cre2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, pkg-config, re2, texinfo }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "--enable-maintainer-mode" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://marcomaggi.github.io/docs/cre2.html"; description = "C Wrapper for RE2"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/criterion/default.nix b/pkgs/development/libraries/criterion/default.nix index bd42a9c866e..ba436fec0a2 100644 --- a/pkgs/development/libraries/criterion/default.nix +++ b/pkgs/development/libraries/criterion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext +{ lib, stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext , dyncall , nanomsg, python37Packages }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform C and C++ unit testing framework for the 21th century"; homepage = "https://github.com/Snaipe/Criterion"; license = licenses.mit; diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 3fe27748155..041e7d49d50 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, nasm, which }: +{ lib, stdenv, fetchFromGitHub, nasm, which }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "crypto++"; version = "8.2.0"; diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix index 61d1d53da63..78d8bce40a3 100644 --- a/pkgs/development/libraries/csfml/default.nix +++ b/pkgs/development/libraries/csfml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, sfml }: +{ lib, stdenv, fetchFromGitHub, cmake, sfml }: let version = "2.5"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ sfml ]; cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.sfml-dev.org/"; description = "Simple and fast multimedia library"; longDescription = '' diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix index 7ca90281abb..be643e3a52c 100644 --- a/pkgs/development/libraries/ctl/default.nix +++ b/pkgs/development/libraries/ctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ilmbase, libtiff, openexr }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ilmbase, libtiff, openexr }: stdenv.mkDerivation rec { pname = "ctl"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libtiff ilmbase openexr ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Color Transformation Language"; homepage = "https://github.com/ampas/CTL"; license = "A.M.P.A.S"; # BSD-derivative, free but GPL incompatible diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index 7c78faaee0b..69380c2eeeb 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, glib }: +{ lib, stdenv, fetchurl, pkg-config, glib }: stdenv.mkDerivation rec { pname = "ctpl"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://ctpl.tuxfamily.org/"; description = "Template engine library written in C"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index 2e3f6a86d49..626606d0526 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "ctpp2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = with stdenv.lib; { + meta = with lib; { description = "A high performance templating engine"; homepage = "http://ctpp.havoc.ru"; maintainers = [ maintainers.robbinch ]; diff --git a/pkgs/development/libraries/ctypes_sh/default.nix b/pkgs/development/libraries/ctypes_sh/default.nix index 6ec2a694970..644c68e85d8 100644 --- a/pkgs/development/libraries/ctypes_sh/default.nix +++ b/pkgs/development/libraries/ctypes_sh/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook, pkg-config , zlib, libffi, elfutils, libdwarf @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ zlib libffi elfutils libdwarf ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A foreign function interface for bash"; homepage = "https://github.com/taviso/ctypes.sh"; license = licenses.mit; diff --git a/pkgs/development/libraries/cudd/default.nix b/pkgs/development/libraries/cudd/default.nix index 6749d2e94c0..4e8cf59fbff 100644 --- a/pkgs/development/libraries/cudd/default.nix +++ b/pkgs/development/libraries/cudd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "cudd"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://davidkebo.com/cudd"; description = "Binary Decision Diagram (BDD) library"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index 6efc28b4c05..9d4ae41f384 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, curl }: +{ lib, stdenv, fetchFromGitHub, cmake, curl }: stdenv.mkDerivation rec { pname = "curlcpp"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ curl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://josephp91.github.io/curlcpp/"; description = "Object oriented C++ wrapper for CURL"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/development/libraries/curlpp/default.nix index 46f1eb33f75..0aee75751d9 100644 --- a/pkgs/development/libraries/curlpp/default.nix +++ b/pkgs/development/libraries/curlpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, curl }: +{ lib, stdenv, fetchFromGitHub, cmake, curl }: stdenv.mkDerivation rec { pname = "curlpp"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl ]; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.curlpp.org/"; description = "C++ wrapper around libcURL"; license = licenses.mit; diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix index 661dc7c816c..748d495063d 100644 --- a/pkgs/development/libraries/cutee/default.nix +++ b/pkgs/development/libraries/cutee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "cutee"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp cutee $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ Unit Testing Easy Environment"; homepage = "http://www.codesink.org/cutee_unit_testing.html"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index a19b1a2d9d0..31a5420e375 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "cwiid-${version}-git"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux Nintendo Wiimote interface"; homepage = "http://cwiid.org"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/pkgs/development/libraries/cxx-prettyprint/default.nix index 34dc30abe61..f632fca714c 100644 --- a/pkgs/development/libraries/cxx-prettyprint/default.nix +++ b/pkgs/development/libraries/cxx-prettyprint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "cxx-prettyprint-unstable"; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { cp prettyprint.hpp "$out/include" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Header only C++ library for pretty printing standard containers"; homepage = "https://github.com/louisdx/cxx-prettyprint"; - license = stdenv.lib.licenses.boost; + license = lib.licenses.boost; platforms = platforms.all; # This is a header-only library, no point in hydra building it: diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index e1898044efa..1a828cc451d 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub }: +{ lib, stdenv, buildPythonApplication, fetchFromGitHub }: buildPythonApplication rec { pname = "cxxtest"; @@ -26,7 +26,7 @@ buildPythonApplication rec { dontWrapPythonPrograms = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://cxxtest.com"; description = "Unit testing framework for C++"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix index ca3c4871732..0d8d2498ae7 100644 --- a/pkgs/development/libraries/cxxtools/default.nix +++ b/pkgs/development/libraries/cxxtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "2.2.1"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.tntnet.org/cxxtools.html"; description = "Comprehensive C++ class library for Unix and Linux"; - platforms = stdenv.lib.platforms.linux ; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.juliendehos ]; + platforms = lib.platforms.linux ; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.juliendehos ]; }; } diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 96778e8960b..b1a6401284a 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -2,7 +2,7 @@ , pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false , buildPackages, pruneLibtoolFiles, fetchpatch }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "cyrus-sasl"; version = "2.1.27"; diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/default.nix index 228fec2f818..bb8ecafbb34 100644 --- a/pkgs/development/libraries/czmq/default.nix +++ b/pkgs/development/libraries/czmq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zeromq }: +{ lib, stdenv, fetchurl, zeromq }: stdenv.mkDerivation rec { version = "4.2.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # Needs to be propagated for the .pc file to work propagatedBuildInputs = [ zeromq ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://czmq.zeromq.org/"; description = "High-level C Binding for ZeroMQ"; license = licenses.mpl20; diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index b78df35190b..2b9357e3ef0 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab +{ lib, stdenv, fetchFromGitLab , meson, ninja, nasm, pkg-config , withTools ? false # "dav1d" binary , withExamples ? false, SDL2 # "dav1dplay" binary @@ -21,15 +21,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja nasm pkg-config ]; # TODO: doxygen (currently only HTML and not build by default). - buildInputs = stdenv.lib.optional withExamples SDL2 - ++ stdenv.lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ]; + buildInputs = lib.optional withExamples SDL2 + ++ lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ]; mesonFlags= [ - "-Denable_tools=${stdenv.lib.boolToString withTools}" - "-Denable_examples=${stdenv.lib.boolToString withExamples}" + "-Denable_tools=${lib.boolToString withTools}" + "-Denable_examples=${lib.boolToString withExamples}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform AV1 decoder focused on speed and correctness"; longDescription = '' The goal of this project is to provide a decoder for most platforms, and diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index dc668a233b0..5cf9200a9ab 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ... } @ args: +{ lib, stdenv, fetchurl, ... } @ args: import ./generic.nix (args // { version = "4.8.30"; diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 1223cb897e8..0bb5c4cd6a4 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ... } @ args: +{ lib, stdenv, fetchurl, ... } @ args: import ./generic.nix (args // { version = "5.3.28"; diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix index 642054b5a01..49935dd2399 100644 --- a/pkgs/development/libraries/db/db-6.0.nix +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ... } @ args: +{ lib, stdenv, fetchurl, ... } @ args: import ./generic.nix (args // { version = "6.0.20"; sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ]; }) diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix index dee07a9637e..b2c0fd7ac8f 100644 --- a/pkgs/development/libraries/db/db-6.2.nix +++ b/pkgs/development/libraries/db/db-6.2.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ... } @ args: +{ lib, stdenv, fetchurl, ... } @ args: import ./generic.nix (args // { version = "6.2.23"; sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7"; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ]; }) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index f439113efb3..a564db369fb 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , cxxSupport ? true , compat185 ? true , dbmSupport ? false @@ -6,7 +6,7 @@ # Options from inherited versions , version, sha256 , extraPatches ? [ ] -, license ? stdenv.lib.licenses.sleepycat +, license ? lib.licenses.sleepycat , drvArgs ? {} }: @@ -27,8 +27,8 @@ stdenv.mkDerivation (rec { (if cxxSupport then "--enable-cxx" else "--disable-cxx") (if compat185 then "--enable-compat185" else "--disable-compat185") ] - ++ stdenv.lib.optional dbmSupport "--enable-dbm" - ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + ++ lib.optional dbmSupport "--enable-dbm" + ++ lib.optional stdenv.isFreeBSD "--with-pic"; preConfigure = '' cd build_unix @@ -47,7 +47,7 @@ stdenv.mkDerivation (rec { make examples_c examples_cxx ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html"; description = "Berkeley DB"; license = license; diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 68b4efb377b..731c038527c 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus, glib, pkg-config, expat }: +{ lib, stdenv, fetchurl, dbus, glib, pkg-config, expat }: stdenv.mkDerivation rec { pname = "dbus-cplusplus"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-ecore" "--disable-tests" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://dbus-cplusplus.sourceforge.net"; description = "C++ API for D-BUS"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 8fb06fe9c44..f56a1eaac24 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPackages +{ lib, stdenv, fetchurl, buildPackages , pkg-config, expat, gettext, libiconv, dbus, glib }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ dbus glib ]; configureFlags = [ "--exec-prefix=${placeholder "dev"}" ] ++ - stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) + lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-dbus-binding-tool=${buildPackages.dbus-glib.dev}/bin/dbus-binding-tool"; doCheck = false; @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dbus.freedesktop.org"; - license = with stdenv.lib.licenses; [ afl21 gpl2 ]; + license = with lib.licenses; [ afl21 gpl2 ]; description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism"; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix index 77cbd6e28ca..f47c91ca3ea 100644 --- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono, dbus-sharp-1_0 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono, dbus-sharp-1_0 }: stdenv.mkDerivation rec { pname = "dbus-sharp-glib"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Bus for .NET: GLib integration module"; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix index 33f0c6b382e..65cd8904366 100644 --- a/pkgs/development/libraries/dbus-sharp-glib/default.nix +++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, mono, dbus-sharp-2_0, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, mono, dbus-sharp-2_0, autoreconfHook }: stdenv.mkDerivation rec { pname = "dbus-sharp-glib"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Bus for .NET: GLib integration module"; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix index 291bb56efde..eb1b20e29eb 100644 --- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkg-config, mono, autoreconfHook }: +{lib, stdenv, fetchFromGitHub, pkg-config, mono, autoreconfHook }: stdenv.mkDerivation rec { pname = "dbus-sharp"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Bus for .NET"; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix index 86a4fce00aa..c64d7bbef99 100644 --- a/pkgs/development/libraries/dbus-sharp/default.nix +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkg-config, mono4, autoreconfHook }: +{lib, stdenv, fetchFromGitHub, pkg-config, mono4, autoreconfHook }: stdenv.mkDerivation rec { pname = "dbus-sharp"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Bus for .NET"; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 4496e59a407..14b6f1fb4cd 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { daemon = dbus.out; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple interprocess messaging system"; homepage = "http://www.freedesktop.org/wiki/Software/dbus/"; license = licenses.gpl2Plus; # most is also under AFL-2.1 diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix index a0005f1bf72..b4e74d03619 100644 --- a/pkgs/development/libraries/dbxml/default.nix +++ b/pkgs/development/libraries/dbxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, db62, xercesc, xqilla }: +{ lib, stdenv, fetchurl, db62, xercesc, xqilla }: stdenv.mkDerivation rec { pname = "dbxml"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cd dbxml ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.oracle.com/database/berkeley-db/xml.html"; description = "Embeddable XML database based on Berkeley DB"; license = licenses.agpl3; diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix index a9929ea2add..b393b74f2b2 100644 --- a/pkgs/development/libraries/dclib/default.nix +++ b/pkgs/development/libraries/dclib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libxml2, openssl, bzip2}: +{lib, stdenv, fetchurl, libxml2, openssl, bzip2}: stdenv.mkDerivation { name = "dclib-0.3.7"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [libxml2 openssl bzip2]; - meta = with stdenv.lib; { + meta = with lib; { description = "Peer-to-Peer file sharing client"; homepage = "http://dcgui.berlios.de"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix index 802befff14c..8d7dc5a0178 100644 --- a/pkgs/development/libraries/dclxvi/default.nix +++ b/pkgs/development/libraries/dclxvi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "dclxvi-2013-01-27"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { patchPhase = '' substituteInPlace Makefile \ --replace "gcc" "cc" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile \ --replace "-soname=libdclxvipairing.so" "-install_name,libdclxvipairing.so" ''; @@ -26,7 +26,7 @@ stdenv.mkDerivation { find . -name \*.so -exec cp {} $out/lib \; ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/agl/dclxvi"; description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library"; platforms = platforms.x86_64; diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index 4b574a17f78..6834a605f1a 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { version = "0.38.0"; outputs = [ "out" "lib" "dev" ] - ++ stdenv.lib.optional (!isCross) "devdoc"; + ++ lib.optional (!isCross) "devdoc"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0n2gqkp6d61h7gnnp2xnxp6w5wcl7w9ay58krrf729qd6d0hzxj5"; }; @@ -38,19 +38,19 @@ stdenv.mkDerivation rec { glib docbook-xsl-nons docbook_xml_dtd_42 - ] ++ stdenv.lib.optional (!isCross) gtk-doc; + ] ++ lib.optional (!isCross) gtk-doc; buildInputs = [ glib bash-completion dbus - ] ++ stdenv.lib.optional (!isCross) vala; + ] ++ lib.optional (!isCross) vala; # Vala cross compilation is broken. For now, build dconf without vapi when cross-compiling. mesonFlags = [ "--sysconfdir=/etc" - "-Dgtk_doc=${stdenv.lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile. - ] ++ stdenv.lib.optional isCross "-Dvapi=false"; + "-Dgtk_doc=${lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile. + ] ++ lib.optional isCross "-Dvapi=false"; doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/dconf"; license = licenses.lgpl21Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index fdbe8783d02..3d46028ec43 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , fetchpatch , pkg-config @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus"; homepage = "https://launchpad.net/dee"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/discord-rpc/default.nix b/pkgs/development/libraries/discord-rpc/default.nix index 3a8290a6597..213096f5abf 100644 --- a/pkgs/development/libraries/discord-rpc/default.nix +++ b/pkgs/development/libraries/discord-rpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , rapidjson @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { buildInputs = [ rapidjson - ] ++ stdenv.lib.optional stdenv.isDarwin AppKit; + ] ++ lib.optional stdenv.isDarwin AppKit; cmakeFlags = [ "-DBUILD_SHARED_LIBS=true" - "-DBUILD_EXAMPLES=${stdenv.lib.boolToString buildExamples}" + "-DBUILD_EXAMPLES=${lib.boolToString buildExamples}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Official library to interface with the Discord client"; homepage = "https://github.com/discordapp/discord-rpc"; license = licenses.mit; diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix index 6570b48e163..a24e0b8d014 100644 --- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, pkg-config, fetchFromGitHub, dbus, dleyna-core, glib }: +{ lib, stdenv, autoreconfHook, pkg-config, fetchFromGitHub, dbus, dleyna-core, glib }: stdenv.mkDerivation rec { pname = "dleyna-connector-dbus"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ dbus dleyna-core glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A D-Bus API for the dLeyna services"; homepage = "https://01.org/dleyna"; maintainers = [ maintainers.jtojnar ]; diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix index 56d40361334..4a4eecfdc0f 100644 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ b/pkgs/development/libraries/dleyna-core/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , autoreconfHook @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { gupnp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library of utility functions that are used by the higher level dLeyna"; homepage = "https://01.org/dleyna"; maintainers = [ maintainers.jtojnar ]; diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index 8bff782bacc..768af6a671a 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkg-config @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { --set DLEYNA_CONNECTOR_PATH "$DLEYNA_CONNECTOR_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to discover and manipulate Digital Media Renderers"; homepage = "https://01.org/dleyna"; maintainers = [ maintainers.jtojnar ]; diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index 4e6d263ed18..a0a414abf74 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , autoreconfHook @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { --set DLEYNA_CONNECTOR_PATH "$DLEYNA_CONNECTOR_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to discover, browse and manipulate Digital Media Servers"; homepage = "https://01.org/dleyna"; maintainers = [ maintainers.jtojnar ]; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 0f0b9720a1a..fa7d70d5213 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libpng libjpeg ] ++ lib.optional guiSupport libX11; - meta = with stdenv.lib; { + meta = with lib; { description = "A general purpose cross-platform C++ machine learning library"; homepage = "http://www.dlib.net"; license = licenses.boost; diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix index 36b791ccc98..f9456b8acac 100644 --- a/pkgs/development/libraries/docopt_cpp/default.nix +++ b/pkgs/development/libraries/docopt_cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python }: +{ lib, stdenv, fetchFromGitHub, cmake, python }: stdenv.mkDerivation rec { version = "0.6.3"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { checkPhase = "LD_LIBRARY_PATH=$(pwd) python ./run_tests"; - meta = with stdenv.lib; { + meta = with lib; { description = "C++11 port of docopt"; homepage = "https://github.com/docopt/docopt.cpp"; license = with licenses; [ mit boost ]; diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index 55f97a425eb..702015e5d38 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, installShellFiles, cmake }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, cmake }: stdenv.mkDerivation rec { pname = "doctest"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/onqtam/doctest"; description = "The fastest feature-rich C++11/14/17/20 single-header testing framework"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index f6320a64374..39d71eee432 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoreconfHook }: +{ fetchFromGitHub, lib, stdenv, autoreconfHook }: stdenv.mkDerivation rec { name = "dotconf-" + version; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A configuration parser library"; maintainers = with maintainers; [ pSub ]; homepage = "https://github.com/williamh/dotconf"; diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index fd7a4e3f5f6..2bdcc3c8a99 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rm BUILD ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Binary-decimal and decimal-binary routines for IEEE doubles"; homepage = "https://github.com/google/double-conversion"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 5c9454d3228..8f67259989b 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libco-canonical +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libco-canonical , libuv, raft-canonical, sqlite-replication }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - meta = with stdenv.lib; { + meta = with lib; { description = '' Expose a SQLite database over the network and replicate it across a cluster of peers diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix index 8479f3c2f8e..41ffdd16f5a 100644 --- a/pkgs/development/libraries/draco/default.nix +++ b/pkgs/development/libraries/draco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "-DBUILD_UNITY_PLUGIN=1" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for compressing and decompressing 3D geometric meshes and point clouds"; homepage = "https://google.github.io/draco/"; license = licenses.asl20; diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 25ecbf03dc1..21572e52e23 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, pkg-config, wrapQtAppsHook , alsaLib, fluidsynth, qtbase, qtsvg, libpulseaudio }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { alsaLib fluidsynth libpulseaudio qtbase qtsvg ]; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ solson ]; description = "MIDI libraries for Qt5/C++"; homepage = "http://drumstick.sourceforge.net/"; diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index cfb0f31af04..9ce487b1b03 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM +{ lib, stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM , libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkg-config }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { libsamplerate libtool autoconf automake xorgproto libICE pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A plugin SDK for virtual instruments"; maintainers = with maintainers; [ diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 1aedee5c3b6..60ccf5aeeb2 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cwida/duckdb"; description = "Embeddable SQL OLAP Database Management System"; license = licenses.mit; diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index 1eb23c1145b..b2cd97398c6 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , qmake }: @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [raskin]; + platforms = lib.platforms.linux; description = "DXF file format library"; }; } diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix index e792fe1e051..0e3fa3ac7dc 100644 --- a/pkgs/development/libraries/dyncall/default.nix +++ b/pkgs/development/libraries/dyncall/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { pname = "dyncall"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { install -D -t $out/share/man/man3 ./*/*.3 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Highly dynamic multi-platform foreign function call interface library"; homepage = "https://www.dyncall.org"; license = licenses.isc; diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index 0c320527784..ad582d93305 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -1,7 +1,7 @@ # To use this package with a CMake and pkg-config build: # pkg_check_modules(EASYLOGGINGPP REQUIRED easyloggingpp) # add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc) -{ stdenv, fetchFromGitHub, cmake, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { pname = "easyloggingpp"; version = "9.97.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [gtest]; cmakeFlags = [ "-Dtest=ON" ]; NIX_CFLAGS_COMPILE = "-std=c++11" + - stdenv.lib.optionalString stdenv.isLinux " -pthread"; + lib.optionalString stdenv.isLinux " -pthread"; postInstall = '' mkdir -p $out/include cp ../src/easylogging++.cc $out/include @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "C++ logging library"; homepage = "https://muflihun.github.io/easyloggingpp/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [acowley]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [acowley]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 867f0e59393..1050490a220 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -1,9 +1,9 @@ -{ fetchurl, stdenv +{ fetchurl, lib, stdenv , cmake, netcdf, openjpeg, libpng, gfortran , enablePython ? false, pythonPackages , enablePosixThreads ? false , enableOpenMPThreads ? false}: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "eccodes"; version = "2.12.5"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { doCheck = true; # Only do tests that don't require downloading 120MB of testdata - checkPhase = stdenv.lib.optionalString (stdenv.isDarwin) '' + checkPhase = lib.optionalString (stdenv.isDarwin) '' substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib" '' + '' ctest -R "eccodes_t_(definitions|calendar|unit_tests|md5|uerra|grib_2nd_order_numValues|julian)" -VV diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 278099b8ca7..4709441a101 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pari @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { pari ntl gmp - ] ++ stdenv.lib.optionals withFlint [ + ] ++ lib.optionals withFlint [ flint ]; nativeBuildInputs = [ autoreconfHook ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Elliptic curve tools"; homepage = "https://github.com/JohnCremona/eclib"; diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 549ef7c56bd..82f65082b94 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { pname = "editline"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://troglobit.com/editline.html"; description = "A readline() replacement for UNIX without termcap (ncurses)"; license = licenses.bsdOriginal; diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix index d1527571943..a2b1ba47e2d 100644 --- a/pkgs/development/libraries/eigen/2.0.nix +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, cmake }: +{ lib, stdenv, fetchFromGitLab, cmake }: stdenv.mkDerivation rec { pname = "eigen"; @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; license = licenses.lgpl3Plus; homepage = "https://eigen.tuxfamily.org"; - maintainers = with stdenv.lib.maintainers; [ sander raskin ]; + maintainers = with lib.maintainers; [ sander raskin ]; branch = "2"; - platforms = with stdenv.lib.platforms; unix; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 3c6a5cc1ca6..079269521c7 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, cmake }: +{ lib, stdenv, fetchFromGitLab, cmake }: stdenv.mkDerivation rec { pname = "eigen"; @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; license = licenses.lgpl3Plus; homepage = "https://eigen.tuxfamily.org"; platforms = platforms.unix; - maintainers = with stdenv.lib.maintainers; [ sander raskin ]; + maintainers = with lib.maintainers; [ sander raskin ]; inherit version; }; } diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index 083dbbc7450..12d4e2a87cc 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw, +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw, openimageio, libjpeg, libpng, libpthreadstubs, libX11 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]; - meta = with stdenv.lib; { + meta = with lib; { description = "High performance ray tracing kernels from Intel"; homepage = "https://embree.github.io/"; maintainers = with maintainers; [ hodapp ]; diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index fad14a898a7..5dee84d1007 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ] ++ lib.optionals stdenv.isDarwin [ glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "High performance ray tracing kernels from Intel"; homepage = "https://embree.github.io/"; maintainers = with maintainers; [ hodapp gebner ]; diff --git a/pkgs/development/libraries/enchant/1.x.nix b/pkgs/development/libraries/enchant/1.x.nix index 671ebb279fa..172d6747aa1 100644 --- a/pkgs/development/libraries/enchant/1.x.nix +++ b/pkgs/development/libraries/enchant/1.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, aspell, pkg-config, glib, hunspell, hspell }: +{ lib, stdenv, fetchurl, aspell, pkg-config, glib, hunspell, hspell }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ aspell glib hunspell hspell ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generic spell checking library"; homepage = "https://abiword.github.io/enchant"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 02215a30418..184d5dcc051 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , aspell , pkg-config @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { "--enable-relocatable" # needed for tests ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Generic spell checking library"; homepage = "https://abiword.github.io/enchant/"; license = licenses.lgpl21Plus; # with extra provision for non-free checkers diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix index 61b8c1be4f2..ef252ad19f6 100644 --- a/pkgs/development/libraries/enet/default.nix +++ b/pkgs/development/libraries/enet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "enet-1.3.17"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://enet.bespin.org/"; description = "Simple and robust network communication layer on top of UDP"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index 35e12eb00c7..955dd2eeb36 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; version = "3.5.2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/skypjack/entt"; description = "A header-only, tiny and easy to use library for game programming and much more written in modern C++"; maintainers = with maintainers; [ twey ]; diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index 7cc7a24f2c8..7ae0e73953f 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, utilmacros, python3 +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, utilmacros, python3 , libGL, libX11 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "epoxy"; diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index 43c9f5a9380..0a10fa3c48c 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gbenchmark, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, gbenchmark, gtest }: stdenv.mkDerivation rec { pname = "ethash"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { #"-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto"; homepage = "https://github.com/ethereum/ethash"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix index d80fdb2213d..ca460aa71f6 100644 --- a/pkgs/development/libraries/eventlog/default.nix +++ b/pkgs/development/libraries/eventlog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "eventlog-0.2.12"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { combination of description and tag/value pairs. ''; homepage = "https://www.balabit.com/support/community/products/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index 5638db71245..356959b429f 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }: +{ lib, stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }: stdenv.mkDerivation rec { pname = "exempi"; @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ expat zlib boost ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ]; + ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ]; doCheck = stdenv.isLinux; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of XMP (Adobe's Extensible Metadata Platform)"; homepage = "https://libopenraw.freedesktop.org/wiki/Exempi/"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index a845e8998e7..9d29afd6927 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , zlib @@ -85,13 +85,13 @@ stdenv.mkDerivation rec { patchShebangs ../test/ mkdir ../test/tmp - ${stdenv.lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) '' + ${lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) '' # Fix tests on arm # https://github.com/Exiv2/exiv2/issues/933 rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py ''} - ${stdenv.lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.isDarwin '' export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib # Removing tests depending on charset conversion substituteInPlace ../test/Makefile --replace "conversions.sh" "" @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.exiv2.org/"; description = "A library and command-line utility to manage image metadata"; platforms = platforms.all; diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index 9f9adb455b9..400d7696e3c 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libosip, openssl, pkg-config, fetchpatch }: +{ lib, stdenv, fetchurl, libosip, openssl, pkg-config, fetchpatch }: stdenv.mkDerivation rec { pname = "libexosip2"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.gpl2Plus; description = "Library that hides the complexity of using the SIP protocol"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 29d2c2b3acb..ba9fb2b177d 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # TODO: fix referrers outputBin = "dev"; - configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + configureFlags = lib.optional stdenv.isFreeBSD "--with-pic"; outputMan = "dev"; # tiny page for a dev tool @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { patchShebangs ./test-driver-wrapper.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.libexpat.org/"; description = "A stream-oriented XML parser library written in C"; platforms = platforms.all; diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index b2c4d3741e1..dbc56572d53 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, autoreconfHook +{ lib, stdenv, fetchurl, autoreconfHook , mp4v2Support ? true, mp4v2 ? null , drmSupport ? false # Digital Radio Mondiale }: assert mp4v2Support -> (mp4v2 != null); -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "faac"; version = "1.30"; diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 90b1a182e55..0afef1c9fd8 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchFromGitHub, autoreconfHook +{lib, stdenv, fetchFromGitHub, autoreconfHook , drmSupport ? false # Digital Radio Mondiale }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "faad2"; version = "2.10.0"; diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix index a528ad6f7f6..9473d09ffc5 100644 --- a/pkgs/development/libraries/farbfeld/default.nix +++ b/pkgs/development/libraries/farbfeld/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }: +{ lib, stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }: stdenv.mkDerivation rec { pname = "farbfeld"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Suckless image format with conversion tools"; license = licenses.isc; platforms = platforms.linux; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index c49c12c03bd..b046b7aef73 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , libnice @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { gst-libav ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/Farstream"; description = "Audio/Video Communications Framework formely known as farsight"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/default.nix b/pkgs/development/libraries/fast-cpp-csv-parser/default.nix index 80306bf506b..5a81e3f7274 100644 --- a/pkgs/development/libraries/fast-cpp-csv-parser/default.nix +++ b/pkgs/development/libraries/fast-cpp-csv-parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "fast-cpp-csv-parser"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteAll ${./fast-cpp-csv-parser.pc.in} $out/lib/pkgconfig/fast-cpp-csv-parser.pc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A small, easy-to-use and fast header-only library for reading comma separated value (CSV) files"; homepage = "https://github.com/ben-strasser/fast-cpp-csv-parser"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix index f1bd647b06d..c56e05e0753 100644 --- a/pkgs/development/libraries/fastjson/default.nix +++ b/pkgs/development/libraries/fastjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libtool, autoconf, automake }: +{ lib, stdenv, fetchFromGitHub, libtool, autoconf, automake }: stdenv.mkDerivation rec { version = "0.99.8"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sh autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast json library for C"; homepage = "https://github.com/rsyslog/libfastjson"; license = licenses.mit; diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/development/libraries/fastpbkdf2/default.nix index eb5cb251620..ac90001fc39 100644 --- a/pkgs/development/libraries/fastpbkdf2/default.nix +++ b/pkgs/development/libraries/fastpbkdf2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl }: +{ lib, stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation { name = "fastpbkdf2-1.0.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { cp fastpbkdf2.h $out/include/fastpbkdf2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast PBKDF2-HMAC-{SHA1,SHA256,SHA512} implementation in C"; homepage = "https://github.com/ctz/fastpbkdf2"; license = licenses.cc0; diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 4a565e3fccc..c030f53df26 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2}: +{ lib, stdenv, fetchFromGitHub, cmake, SDL2}: #TODO: tests @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "XAudio reimplementation focusing to develop a fully accurate DirectX audio library"; homepage = "https://github.com/FNA-XNA/FAudio"; license = licenses.zlib; diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index bde1682e3fc..1ec666a920c 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "fcgi"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = "ln -s . $out/include/fastcgi"; - meta = with stdenv.lib; { + meta = with lib; { description = "A language independent, scalable, open extension to CG"; homepage = "http://www.fastcgi.com/"; license = "FastCGI see LICENSE.TERMS"; diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index d76772500fb..380fdcce29f 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, catch2, metal }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, catch2, metal }: stdenv.mkDerivation rec { pname = "fcppt"; version = "3.5.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=false" "-DENABLE_BOOST=true" "-DENABLE_EXAMPLES=true" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Freundlich's C++ toolkit"; longDescription = '' Freundlich's C++ Toolkit (fcppt) is a collection of libraries focusing on diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 53967381570..dc64a6edce0 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , exampleSupport ? false # Example encoding program }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "fdk-aac"; version = "2.0.1"; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index d62d3dd7cc6..fd7d89a8831 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkg-config, blas, lapack +{ lib, stdenv, fetchFromGitHub, autoreconfHook, givaro, pkg-config, blas, lapack , gmpxx }: @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config - ] ++ stdenv.lib.optionals doCheck checkInputs; + ] ++ lib.optionals doCheck checkInputs; buildInputs = [ givaro blas lapack ]; configureFlags = [ "--with-blas-libs=-lcblas" "--with-lapack-libs=-llapacke" - ] ++ stdenv.lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284) "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Finite Field Linear Algebra Subroutines"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 27f2c65e867..916ea2772e1 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkg-config, perl, texinfo, yasm +{ lib, stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkg-config, perl, texinfo, yasm /* * Licensing options (yes some are listed twice, filters and such are not listed) */ @@ -184,7 +184,7 @@ let inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux isAarch64; - inherit (stdenv.lib) optional optionals optionalString enableFeature; + inherit (lib) optional optionals optionalString enableFeature; in /* @@ -260,9 +260,9 @@ stdenv.mkDerivation rec { prePatch = '' patchShebangs . - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c - '' + stdenv.lib.optionalString (frei0r != null) '' + '' + lib.optionalString (frei0r != null) '' substituteInPlace libavfilter/vf_frei0r.c \ --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 substituteInPlace doc/filters.texi \ @@ -467,7 +467,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; homepage = "https://www.ffmpeg.org/"; longDescription = '' diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix index d01f22c0b3a..daa03d0293a 100644 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, libsixel, yasm +{ lib, stdenv, fetchFromGitHub, pkg-config, libsixel, yasm }: stdenv.mkDerivation { @@ -27,7 +27,7 @@ stdenv.mkDerivation { mv $out/bin/ffmpeg $out/bin/ffmpeg-sixel ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video, extended to support console graphics"; homepage = "http://www.ffmpeg.org/"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index bc4de6a5b4a..0dfa639c338 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm +{ lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d @@ -44,7 +44,7 @@ let inherit (stdenv) isDarwin isFreeBSD isLinux isAarch32; - inherit (stdenv.lib) optional optionals optionalString enableFeature filter; + inherit (lib) optional optionals optionalString enableFeature filter; cmpVer = builtins.compareVersions; reqMin = requiredVersion: (cmpVer requiredVersion branch != 1); @@ -211,7 +211,7 @@ stdenv.mkDerivation rec { inherit vaapiSupport vdpauSupport; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; homepage = "http://www.ffmpeg.org/"; longDescription = '' diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 6c8e689840e..2e68dbb1d12 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkg-config, libjpeg +{ fetchFromGitHub, lib, stdenv, ffmpeg_3, cmake, libpng, pkg-config, libjpeg }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg_3 libpng libjpeg ]; cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; description = "A lightweight video thumbnailer"; longDescription = "FFmpegthumbnailer is a lightweight video diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 3dfe697981c..7fa96cff7f8 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkg-config }: +{ lib, stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkg-config }: stdenv.mkDerivation rec { pname = "ffms"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ln -s $out/lib/libffms2.so $out/lib/vapoursynth/libffms2.so ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/FFMS/ffms2/"; description = "Libav/ffmpeg based source library for easy frame accurate access"; license = licenses.mit; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index ba7e86747a7..f0632e1460a 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { checkInputs = [ perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fastest Fourier Transform in the West library"; homepage = "http://www.fftw.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix index 3438bfee07b..a412f707047 100644 --- a/pkgs/development/libraries/filter-audio/default.nix +++ b/pkgs/development/libraries/filter-audio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "filter-audio"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight audio filtering library made from webrtc code"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index a61d11c2578..91339380424 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }: stdenv.mkDerivation { name = "flann-1.9.1"; @@ -22,9 +22,9 @@ stdenv.mkDerivation { meta = { homepage = "http://people.cs.ubc.ca/~mariusm/flann/"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; description = "Fast approximate nearest neighbor searches in high dimensional spaces"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 0b96a91e45f..374203556a6 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "flatbuffers"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }) ]; - preConfigure = stdenv.lib.optional stdenv.buildPlatform.isDarwin '' + preConfigure = lib.optional stdenv.buildPlatform.isDarwin '' rm BUILD ''; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Memory Efficient Serialization Library"; longDescription = '' FlatBuffers is an efficient cross platform serialization library for diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix index 6239dba2836..6b40814119c 100644 --- a/pkgs/development/libraries/flatcc/default.nix +++ b/pkgs/development/libraries/flatcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { description = "FlatBuffers Compiler and Library in C for C "; homepage = "https://github.com/dvidelabs/flatcc"; - license = [ stdenv.lib.licenses.asl20 ]; + license = [ lib.licenses.asl20 ]; }; } diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 6f8634c01ef..1480f42750d 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , autoconf @@ -196,7 +196,7 @@ stdenv.mkDerivation rec { in '' patchShebangs buildutil patchShebangs tests - PATH=${stdenv.lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler + PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler ''; preConfigure = '' @@ -215,7 +215,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux application sandboxing and distribution framework"; homepage = "https://flatpak.org/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 96c53698401..7bfa701db73 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , gmp @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mpir mpfr ntl - ] ++ stdenv.lib.optionals withBlas [ + ] ++ lib.optionals withBlas [ openblas ]; propagatedBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "--with-mpir=${mpir}" "--with-mpfr=${mpfr}" "--with-ntl=${ntl}" - ] ++ stdenv.lib.optionals withBlas [ + ] ++ lib.optionals withBlas [ "--with-blas=${openblas}" ]; @@ -53,9 +53,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Fast Library for Number Theory"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "http://www.flintlib.org/"; downloadPage = "http://www.flintlib.org/downloads.html"; updateWalker = true; diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index 1db8a9fbe2f..24927fe853b 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, alsaLib }: +{ lib, stdenv, fetchFromGitHub, alsaLib }: stdenv.mkDerivation rec { pname = "flite"; @@ -11,15 +11,15 @@ stdenv.mkDerivation rec { sha256 = "1n0p81jzndzc1rzgm66kw9ls189ricy5v1ps11y0p2fk1p56kbjf"; }; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ]; + buildInputs = lib.optionals stdenv.isLinux [ alsaLib ]; configureFlags = [ "--enable-shared" - ] ++ stdenv.lib.optionals stdenv.isLinux [ "--with-audio=alsa" ]; + ] ++ lib.optionals stdenv.isLinux [ "--with-audio=alsa" ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A small, fast run-time speech synthesis engine"; homepage = "http://www.festvox.org/flite/"; license = licenses.bsdOriginal; diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index 4c482176fcb..2db0aea3ecf 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi +{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi , freeglut, libGLU, libGL, libjpeg, zlib, libXft, libpng , libtiff, freetype, Cocoa, AGL, GLUT }: @@ -16,11 +16,11 @@ stdenv.mkDerivation { sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ] - ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; + ++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; propagatedBuildInputs = [ xorgproto ] ++ (if stdenv.isDarwin @@ -39,7 +39,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ cross-platform lightweight GUI library"; homepage = "https://www.fltk.org"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index ca8198fb271..5cbd993fc64 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi +{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi , freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng , libtiff, freetype, Cocoa, AGL, GLUT }: @@ -16,11 +16,11 @@ stdenv.mkDerivation { sha256 = "00jp24z1818k9n6nn6lx7qflqf2k13g4kxr0p8v1d37kanhb4ac7"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ] - ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; + ++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; propagatedBuildInputs = [ xorgproto ] ++ (if stdenv.isDarwin @@ -37,7 +37,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ cross-platform lightweight GUI library"; homepage = "https://www.fltk.org"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 2f490891433..0d2983b1f84 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -28,7 +28,7 @@ let doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Small, safe and fast formatting library"; longDescription = '' fmt (formerly cppformat) is an open-source formatting library. It can be diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 7b2ca83fe5b..955b7e0d16f 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -1,5 +1,5 @@ { fetchurl -, stdenv +, lib, stdenv , pkg-config , meson , ninja @@ -38,13 +38,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn"; }; mesonFlags = [ "-Ddocs=true" - "-Dtelepathy_backend=${stdenv.lib.boolToString telepathySupport}" + "-Dtelepathy_backend=${lib.boolToString telepathySupport}" ]; nativeBuildInputs = [ @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { nspr nss readline - ] ++ stdenv.lib.optional telepathySupport telepathy-glib; + ] ++ lib.optional telepathySupport telepathy-glib; propagatedBuildInputs = [ glib @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library that aggregates people from multiple sources to create metacontacts"; homepage = "https://wiki.gnome.org/Projects/Folks"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 26680b2d23c..0ad4f2a50c1 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , boost @@ -52,7 +52,7 @@ stdenv.mkDerivation (rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An open-source C++ library developed and used at Facebook"; homepage = "https://github.com/facebook/folly"; license = licenses.asl20; @@ -60,6 +60,6 @@ stdenv.mkDerivation (rec { platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ abbradar pierreis ]; }; -} // stdenv.lib.optionalAttrs stdenv.isDarwin { +} // lib.optionalAttrs stdenv.isDarwin { LDFLAGS = "-ljemalloc"; }) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index e08149903a2..daedaefcf9c 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchpatch , substituteAll , fetchurl @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/ # just <1MB; this is what you get when loading config fails for some reason "--with-default-fonts=${dejavu_fonts.minimal}" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ]; @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { rm -r $bin/share/man/man3 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for font customization and configuration"; homepage = "http://fontconfig.org/"; license = licenses.bsd2; # custom but very bsd-like diff --git a/pkgs/development/libraries/forge/default.nix b/pkgs/development/libraries/forge/default.nix index aec790dd843..ba85cea73d6 100644 --- a/pkgs/development/libraries/forge/default.nix +++ b/pkgs/development/libraries/forge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , arrayfire, expat, fontconfig, freeimage, freetype, boost , mesa, libGLU, libGL, glfw3, SDL2, cudatoolkit }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { arrayfire ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend"; longDescription = '' An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend. diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 5dacf53b259..408518ba79c 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft +{ lib, stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft , CoreServices ? null }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./clang.patch ]; buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ] - ++ stdenv.lib.optional stdenv.isDarwin CoreServices; + ++ lib.optional stdenv.isDarwin CoreServices; doCheck = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ based class library for building Graphical User Interfaces"; longDescription = '' FOX stands for Free Objects for X. diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 208780a450e..50f9e688cb9 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor +{ lib, stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor , libXrandr, libGLU, libGL, libXft, libXfixes, xinput , CoreServices }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft libGLU libGL libXfixes xinput - ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices; + ] ++ lib.optional stdenv.isDarwin CoreServices; doCheck = true; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; homepage = "http://fox-toolkit.org"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; maintainers = []; - platforms = stdenv.lib.platforms.mesaPlatforms; + platforms = lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/libraries/fplll/20160331.nix b/pkgs/development/libraries/fplll/20160331.nix index 05a6a30a6ec..374aec5904d 100644 --- a/pkgs/development/libraries/fplll/20160331.nix +++ b/pkgs/development/libraries/fplll/20160331.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook +{lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook , gmp, mpfr }: stdenv.mkDerivation rec { @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Lattice algorithms using floating-point arithmetic"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index e15479bafcf..3a82b566a50 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , gettext @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mpfr ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lattice algorithms using floating-point arithmetic"; changelog = [ # Some release notes are added to the github tags, though they are not diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index 76549e728eb..e96aa9394da 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true -, stdenv, fetchurl, pkg-config, xorg }: +, lib, stdenv, fetchurl, pkg-config, xorg }: stdenv.mkDerivation rec { pname = "frame"; @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv pkg-config - ] ++ stdenv.lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi]; + ] ++ lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi]; - configureFlags = stdenv.lib.optional enableX11 "--with-x11"; + configureFlags = lib.optional enableX11 "--with-x11"; meta = { homepage = "https://launchpad.net/frame"; description = "Handles the buildup and synchronization of a set of simultaneous touches"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix index 2c9a893284b..3bb6eaddfa3 100644 --- a/pkgs/development/libraries/freealut/default.nix +++ b/pkgs/development/libraries/freealut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, darwin, fetchurl, openal }: +{ lib, stdenv, darwin, fetchurl, openal }: stdenv.mkDerivation rec { name = "freealut-1.1.0"; @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ openal - ] ++ stdenv.lib.optional stdenv.isDarwin + ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.OpenAL ; meta = { homepage = "http://openal.org/"; description = "Free implementation of OpenAL's ALUT standard"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index bb61231d445..83e3eebdcc3 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }: +{ lib, stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }: let version = "3.2.1"; in stdenv.mkDerivation { @@ -15,7 +15,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper ]; - cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${libGL}/include" "-DOPENGL_gl_LIBRARY:FILEPATH=${libGL}/lib/libGL.dylib" "-DOPENGL_glu_LIBRARY:FILEPATH=${libGLU}/lib/libGLU.dylib" @@ -23,7 +23,7 @@ in stdenv.mkDerivation { "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Create and manage windows containing OpenGL contexts"; longDescription = '' FreeGLUT is an open source alternative to the OpenGL Utility Toolkit diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index df26ac9978d..8e6904a94b2 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkg-config +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config , openssl , odbcSupport ? true, unixODBC ? null }: @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { buildInputs = [ openssl - ] ++ stdenv.lib.optional odbcSupport unixODBC; + ] ++ lib.optional odbcSupport unixODBC; nativeBuildInputs = [ autoreconfHook pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; homepage = "https://www.freetds.org"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 4e4db4b844e..7b5fff29a28 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , buildPackages , pkg-config, which, makeWrapper , zlib, bzip2, libpng, gnumake, glib @@ -10,13 +10,13 @@ }: let - inherit (stdenv.lib) optional optionalString; + inherit (lib) optional optionalString; in stdenv.mkDerivation rec { pname = "freetype"; version = "2.10.4"; - meta = with stdenv.lib; { + meta = with lib; { description = "A font rendering engine"; longDescription = '' FreeType is a portable and efficient library for rendering fonts. It diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index 8a059041998..c4f99346296 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, cairo, opencv, pkg-config }: +{ lib, stdenv, fetchurl, autoconf, cairo, opencv, pkg-config }: stdenv.mkDerivation rec { pname = "frei0r-plugins"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf pkg-config ]; buildInputs = [ cairo opencv ]; - postInstall = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $out/lib/frei0r-1/*.so* ; do ln -s $f "''${f%.*}.dylib" done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://frei0r.dyne.org"; description = "Minimalist, cross-platform, shared video plugins"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 0055811e185..27f3b825d10 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPackages , fetchurl , meson @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ meson ninja pkg-config ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; depsBuildBuild = [ buildPackages.stdenv.cc ]; doCheck = true; checkInputs = [ python3 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/fribidi/fribidi"; description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix index 46b579d4abd..c91e8517b07 100644 --- a/pkgs/development/libraries/fstrcmp/default.nix +++ b/pkgs/development/libraries/fstrcmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libtool, ghostscript, groff, autoreconfHook }: +{ lib, stdenv, fetchzip, libtool, ghostscript, groff, autoreconfHook }: stdenv.mkDerivation rec { pname = "fstrcmp"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Make fuzzy comparisons of strings and byte arrays"; longDescription = '' The fstrcmp project provides a library that is used to make fuzzy diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix index cd36af184b4..46a7118cefe 100644 --- a/pkgs/development/libraries/fstrm/default.nix +++ b/pkgs/development/libraries/fstrm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libevent, openssl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libevent, openssl }: stdenv.mkDerivation rec { pname = "fstrm"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Frame Streams implementation in C"; homepage = "https://github.com/farsightsec/fstrm"; license = licenses.asl20; diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index a0ce9db815b..c3fd6ffb940 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, freetype, libGL, libGLU, OpenGL }: +{ lib, stdenv, fetchurl, freetype, libGL, libGLU, OpenGL }: let name = "ftgl-2.1.3-rc5"; @@ -18,14 +18,14 @@ stdenv.mkDerivation { [ libGL libGLU ]) ; - configureFlags = [ "--with-ft-prefix=${stdenv.lib.getDev freetype}" ]; + configureFlags = [ "--with-ft-prefix=${lib.getDev freetype}" ]; enableParallelBuilding = true; meta = { homepage = "https://sourceforge.net/apps/mediawiki/ftgl/"; description = "Font rendering library for OpenGL applications"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' FTGL is a free cross-platform Open Source C++ library that uses @@ -34,7 +34,7 @@ stdenv.mkDerivation { and extruded polygon rendering modes. ''; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; maintainers = []; }; } diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index 064dbb39a2f..377aa45cf5e 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }: +{ lib, stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }: stdenv.mkDerivation { name = "funambol-client-cpp-9.0.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook unzip ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SyncML client sdk by Funambol project"; homepage = "http://www.funambol.com"; license = licenses.agpl3; diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix index 84594b8dbeb..888f26f2da7 100644 --- a/pkgs/development/libraries/galario/default.nix +++ b/pkgs/development/libraries/galario/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchzip , fetchFromGitHub , cmake @@ -30,17 +30,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ fftw fftwFloat ] - ++ stdenv.lib.optional enablePython pythonPackages.python - ++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp + ++ lib.optional enablePython pythonPackages.python + ++ lib.optional stdenv.isDarwin llvmPackages.openmp ; - propagatedBuildInputs = stdenv.lib.optional enablePython [ + propagatedBuildInputs = lib.optional enablePython [ pythonPackages.numpy pythonPackages.cython pythonPackages.pytest ]; - checkInputs = stdenv.lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytestcov ]; + checkInputs = lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytestcov ]; preConfigure = '' mkdir -p build/external/src @@ -55,12 +55,12 @@ stdenv.mkDerivation rec { doCheck = true; - postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enablePython) '' + postInstall = lib.optionalString (stdenv.isDarwin && enablePython) '' install_name_tool -change libgalario.dylib $out/lib/libgalario.dylib $out/lib/python*/site-packages/galario/double/libcommon.so install_name_tool -change libgalario_single.dylib $out/lib/libgalario_single.dylib $out/lib/python*/site-packages/galario/single/libcommon.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GPU Accelerated Library for Analysing Radio Interferometer Observations"; longDescription = '' Galario is a library that exploits the computing power of modern diff --git a/pkgs/development/libraries/gamenetworkingsockets/default.nix b/pkgs/development/libraries/gamenetworkingsockets/default.nix index 5f2fdb8f749..0546bfb8e08 100644 --- a/pkgs/development/libraries/gamenetworkingsockets/default.nix +++ b/pkgs/development/libraries/gamenetworkingsockets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, go, protobuf, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, ninja, go, protobuf, openssl }: stdenv.mkDerivation rec { pname = "GameNetworkingSockets"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ protobuf openssl ]; - meta = with stdenv.lib; { + meta = with lib; { # build failure is resolved on master, remove at next release broken = stdenv.isDarwin; description = "GameNetworkingSockets is a basic transport layer for games"; diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index eb11bc6d72b..56de42d9dc5 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }: let cross = stdenv.hostPlatform != stdenv.buildPlatform; @@ -24,15 +24,15 @@ in stdenv.mkDerivation (rec { patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix) - ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + ++ lib.optional stdenv.cc.isClang ./returnval.patch + ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "fix-pthread-mutex.patch"; url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; - }) ++ stdenv.lib.optional (cross) ./abstract-socket-namespace.patch ; + }) ++ lib.optional (cross) ./abstract-socket-namespace.patch ; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://people.gnome.org/~veillard/gamin/"; description = "A file and directory monitoring system"; maintainers = with maintainers; [ lovek323 ]; @@ -41,7 +41,7 @@ in stdenv.mkDerivation (rec { }; } -// stdenv.lib.optionalAttrs stdenv.isDarwin { +// lib.optionalAttrs stdenv.isDarwin { preBuild = '' sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile ''; diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index 13056846017..bf6c030589b 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python, wafHook }: +{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python, wafHook }: stdenv.mkDerivation rec { pname = "ganv"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ graphviz gtk2 gtkmm2 python ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An interactive Gtk canvas widget for graph-based interfaces"; homepage = "http://drobilla.net"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix index 97449d944ec..424e3751f40 100644 --- a/pkgs/development/libraries/garmintools/default.nix +++ b/pkgs/development/libraries/garmintools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, libusb-compat-0_1 }: stdenv.mkDerivation { name = "garmintools-0.10"; src = fetchurl { @@ -9,8 +9,8 @@ stdenv.mkDerivation { meta = { description = "Provides the ability to communicate with the Garmin Forerunner 305 via the USB interface"; homepage = "https://code.google.com/archive/p/garmintools/"; # community clone at https://github.com/ianmartin/garmintools - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index ab6a379116d..c1f485e18d9 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { pname = "gbenchmark"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A microbenchmark support library"; homepage = "https://github.com/google/benchmark"; license = licenses.asl20; diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 9d9e6cd1c15..8f62483d3b7 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , gettext , gobject-introspection @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "13q43iqld4l50yra45lhvkd376pn6qpk7rkx374zn8y9wsdzm9b7"; }; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GObject library to create cabinet files"; homepage = "https://gitlab.gnome.org/GNOME/gcab"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix index 486a24defd1..b123f799cca 100644 --- a/pkgs/development/libraries/gcc/libstdc++/5.nix +++ b/pkgs/development/libraries/gcc/libstdc++/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, flex, bison, file }: +{ lib, stdenv, fetchurl, fetchpatch, flex, bison, file }: stdenv.mkDerivation rec { pname = "libstdc++5"; @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { rm -rf $out/lib/!(libstdc++*) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gcc.gnu.org/"; license = licenses.lgpl3Plus; description = "GNU Compiler Collection, version ${version} -- C++ standard library"; diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index a2eea019400..8add81e2796 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , meson @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1q97pba4bzjndm1vlvicyv8mrl0n589qsw71dp8jrz2payvcfk56"; }; @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; maintainers = teams.gnome.members; description = "GNOME crypto services (daemon and tools)"; diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 3b4533890a7..36a93095603 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , autoconf , automake , pkg-config @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; # -pthread gets passed to clang, causing warnings - configureFlags = stdenv.lib.optional stdenv.isDarwin "--enable-werror=no"; + configureFlags = lib.optional stdenv.isDarwin "--enable-werror=no"; nativeBuildInputs = [ autoconf automake pkg-config ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 2 tests - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libgd.github.io/"; description = "A dynamic image creation library"; license = licenses.free; # some custom license diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix index d3505679e4d..9cb9c448c1d 100644 --- a/pkgs/development/libraries/gdal/2.4.0.nix +++ b/pkgs/development/libraries/gdal/2.4.0.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib +{ lib, stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib , postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv, libxml2 , netcdfSupport ? true, netcdf, hdf5, curl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "gdal"; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite libspatialite poppler hdf4 qhull giflib expat libxml2 proj ] ++ (with pythonPackages; [ python numpy wrapPython ]) - ++ stdenv.lib.optional stdenv.isDarwin libiconv - ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; + ++ lib.optional stdenv.isDarwin libiconv + ++ lib.optionals netcdfSupport [ netcdf hdf5 curl ]; configureFlags = [ "--with-expat=${expat.dev}" @@ -97,8 +97,8 @@ stdenv.mkDerivation rec { meta = { description = "Translator library for raster geospatial data formats"; homepage = "https://www.gdal.org/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.marcweber ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 1295a100232..8c02919126b 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql +{ lib, stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql , libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl, libpng , sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat, libiconv, libxml2 , autoreconfHook, netcdfSupport ? true, netcdf, hdf5, curl, pkg-config }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "gdal"; @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { libxml2 postgresql ] ++ (with pythonPackages; [ python numpy wrapPython ]) - ++ stdenv.lib.optional stdenv.isDarwin libiconv - ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; + ++ lib.optional stdenv.isDarwin libiconv + ++ lib.optionals netcdfSupport [ netcdf hdf5 curl ]; configureFlags = [ "--with-expat=${expat.dev}" @@ -87,8 +87,8 @@ stdenv.mkDerivation rec { meta = { description = "Translator library for raster geospatial data formats"; homepage = "https://www.gdal.org/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.marcweber ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 3695407b8f2..92d17452c94 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libjpeg, libtiff, zlib +{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib , postgresql, mysql57, libgeotiff, python, pythonPackages, proj, geos, openssl , libpng }: @@ -59,8 +59,8 @@ stdenv.mkDerivation rec { meta = { description = "Translator library for raster geospatial data formats"; homepage = "https://www.gdal.org/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.marcweber ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index 22034733f5e..21cb79ba815 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, pkg-config, mono, dotnetPackages }: +{ lib, stdenv, fetchsvn, pkg-config, mono, dotnetPackages }: let newtonsoft-json = dotnetPackages.NewtonsoftJson; @@ -26,7 +26,7 @@ in stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://code.google.com/archive/p/google-gdata/"; description = "The Google Data APIs"; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index b04828c92dd..75ce95e0e46 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, vtk_7, darwin +{ lib, stdenv, fetchurl, cmake, vtk_7, darwin , enablePython ? false, python ? null, swig ? null}: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "-DGDCM_BUILD_SHARED_LIBS=ON" "-DGDCM_USE_VTK=ON" ] - ++ stdenv.lib.optional enablePython [ + ++ lib.optional enablePython [ "-DGDCM_WRAP_PYTHON:BOOL=ON" "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}" ]; @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ vtk_7 ] - ++ stdenv.lib.optional stdenv.isDarwin [ + ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.Cocoa - ] ++ stdenv.lib.optional enablePython [ swig python ]; + ] ++ lib.optional enablePython [ swig python ]; propagatedBuildInputs = [ ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The grassroots cross-platform DICOM implementation"; longDescription = '' Grassroots DICOM (GDCM) is an implementation of the DICOM standard designed to be open source so that researchers may access clinical data directly. diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index ad92bf13c4c..2d8e60d06a7 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"; }; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { gobject-introspection makeWrapper glib - ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ glib @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { postInstall = # meson erroneously installs loaders with .dylib extension on Darwin. # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them. - stdenv.lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.isDarwin '' for f in $out/${passthru.moduleDir}/*.dylib; do install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f mv $f ''${f%.dylib}.so @@ -88,13 +88,13 @@ stdenv.mkDerivation rec { + '' moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" - '' + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; # The fixDarwinDylibNames hook doesn't patch binaries. - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.isDarwin '' for f in $out/bin/* $dev/bin/*; do install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f done @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { moduleDir = "lib/gdk-pixbuf-2.0/2.10.0/loaders"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for image loading and manipulation"; homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf"; maintainers = [ maintainers.eelco ] ++ teams.gnome.members; diff --git a/pkgs/development/libraries/gdk-pixbuf/xlib.nix b/pkgs/development/libraries/gdk-pixbuf/xlib.nix index edc5ce52563..bc4c14beb45 100644 --- a/pkgs/development/libraries/gdk-pixbuf/xlib.nix +++ b/pkgs/development/libraries/gdk-pixbuf/xlib.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , meson , ninja @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { "-Dgtk_doc=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Deprecated API for integrating GdkPixbuf with Xlib data types"; homepage = "https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix index 7b3d1d4e831..f924571deae 100644 --- a/pkgs/development/libraries/gdl/default.nix +++ b/pkgs/development/libraries/gdl/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome3, intltool }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome3, intltool }: stdenv.mkDerivation rec { pname = "gdl"; version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gdl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "00ldva6wg6s4wlxmisiqzyz8ihsprra7sninx2rlqk6frpq312w5"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Gnome docking library"; homepage = "https://developer.gnome.org/gdl/"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix index ec0621c5a3d..a7dd1f98013 100644 --- a/pkgs/development/libraries/gdome2/default.nix +++ b/pkgs/development/libraries/gdome2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkg-config, glib, libxml2, gtk-doc}: +{lib, stdenv, fetchurl, pkg-config, glib, libxml2, gtk-doc}: let pname = "gdome2"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [glib libxml2]; patches = [ ./xml-document.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gdome2.cs.unibo.it/"; description = "DOM C library developed for the Gnome project"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix index 545bdd12982..5c660a99ef8 100644 --- a/pkgs/development/libraries/gecode/3.nix +++ b/pkgs/development/libraries/gecode/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, perl }: +{ lib, stdenv, fetchurl, bash, perl }: stdenv.mkDerivation rec { pname = "gecode"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs configure"; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; homepage = "https://www.gecode.org"; description = "Toolkit for developing constraint-based systems"; diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix index 9d37199bff4..46b13e6e37f 100644 --- a/pkgs/development/libraries/gecode/default.nix +++ b/pkgs/development/libraries/gecode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }: +{ lib, stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }: stdenv.mkDerivation rec { pname = "gecode"; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ bison flex ]; buildInputs = [ perl gmp mpfr ] - ++ stdenv.lib.optional enableGist qtbase; + ++ lib.optional enableGist qtbase; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; homepage = "https://www.gecode.org"; description = "Toolkit for developing constraint-based systems"; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 4852db0dac3..af3c9d84ac7 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , pkg-config @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "sha256-DzceLtK5IWL+/T3edD5kjKCKahsrBQBIZ/vdx+IR5CQ="; }; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { luajit openexr suitesparse - ] ++ stdenv.lib.optional stdenv.isDarwin OpenCL; + ] ++ lib.optional stdenv.isDarwin OpenCL; # for gegl-4.0.pc propagatedBuildInputs = [ @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { # tests fail to connect to the com.apple.fonts daemon in sandboxed mode doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "Graph-based image processing framework"; homepage = "https://www.gegl.org"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 93adb49d8b7..bd67f3e6b7c 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , babl @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-docs" ]; buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] - ++ stdenv.lib.optional stdenv.isDarwin OpenGL; + ++ lib.optional stdenv.isDarwin OpenGL; nativeBuildInputs = [ pkg-config ]; doCheck = false; # fails 3 out of 19 tests - meta = with stdenv.lib; { + meta = with lib; { description = "Graph-based image processing framework"; homepage = "https://www.gegl.org"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index b7623d15dd4..1c1d4cfe507 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pkg-config , python3Packages , wrapGAppsHook @@ -18,7 +18,7 @@ , xorgserver }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "geis"; diff --git a/pkgs/development/libraries/genann/default.nix b/pkgs/development/libraries/genann/default.nix index 6529d4f363d..f1d7373183a 100644 --- a/pkgs/development/libraries/genann/default.nix +++ b/pkgs/development/libraries/genann/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "genann"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp ./genann.{h,c} $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/codeplea/genann"; description = "Simple neural network library in ANSI C"; license = licenses.zlib; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 8e54c6c43b0..711f1a444b3 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkg-config, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf +{ lib, stdenv, fetchFromGitLab, intltool, meson, ninja, pkg-config, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf , modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobject-introspection, vala , withDemoAgent ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "geoclue"; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { patchShebangs demo/install-file.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Geolocation framework and some data providers"; homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index a13cbdfc159..f401c25aa39 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }: +{ fetchurl, lib, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }: stdenv.mkDerivation rec { pname = "geocode-glib"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A convenience library for the geocoding and reverse geocoding using Nominatim service"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index d55983952b8..8747433047c 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , drvName ? "geoip" # in geoipDatabase, you can insert a package defining @@ -7,7 +7,7 @@ }: let - dataDir = if stdenv.lib.isDerivation geoipDatabase + dataDir = if lib.isDerivation geoipDatabase then "${toString geoipDatabase}/share/GeoIP" else geoipDatabase; in @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; # Cross compilation shenanigans - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An API for GeoIP/Geolocation databases"; maintainers = with maintainers; [ thoughtpolice raskin ]; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 60fc4067c0c..63806b31e25 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ lib, stdenv, fetchurl, python }: stdenv.mkDerivation rec { name = "geos-3.8.1"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; # https://trac.osgeo.org/geos/ticket/993 - configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-inline"; + configureFlags = lib.optional stdenv.isAarch32 "--disable-inline"; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index 28bbe61d53d..de76924844f 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool }: +{ lib, stdenv, fetchurl, libtool }: stdenv.mkDerivation rec { pname = "getdata"; version = "0.10.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Reference implementation of the Dirfile Standards"; license = licenses.lgpl21Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index c0268c161ae..edf0ac27ea9 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unbound, libidn2, openssl, doxygen, cmake }: +{ lib, stdenv, fetchurl, unbound, libidn2, openssl, doxygen, cmake }: stdenv.mkDerivation rec { pname = "getdns"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ unbound libidn2 openssl doxygen ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern asynchronous DNS API"; longDescription = '' getdns is an implementation of a modern asynchronous DNS API; the diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 0dcc42dc526..3f8215d19fc 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-csharp" "--with-xz" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # On cross building, gettext supposes that the wchar.h from libc # does not fulfill gettext needs, so it tries to work with its # own wchar.h file, which does not cope well with the system's @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { xz.bin ]; # HACK, see #10874 (and 14664) - buildInputs = stdenv.lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv; + buildInputs = lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv; setupHooks = [ ../../../build-support/setup-hooks/role.bash @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { }; } -// stdenv.lib.optionalAttrs stdenv.isDarwin { +// lib.optionalAttrs stdenv.isDarwin { makeFlags = [ "CFLAGS=-D_FORTIFY_SOURCE=0" ]; } diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index b9d287ba2eb..220b68fa18b 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: stdenv.mkDerivation rec { pname = "gexiv2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xxxq8xdkgkn146my307jgws4qgxx477h0ybg1mqza1ycmczvsla"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/gexiv2"; description = "GObject wrapper around the Exiv2 photo metadata library"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index 93286e85d12..e3550b82a96 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, glib, librest, gnome-online-accounts +{ lib, stdenv, fetchurl, pkg-config, glib, librest, gnome-online-accounts , gnome3, libsoup, json-glib, gobject-introspection , gtk-doc, pkgs, docbook-xsl-nons, autoconf, automake, libtool }: @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0yck7dwvjk16a52nafjpi0a39rxwmg0w833brj45acz76lgkjrb0"; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GFBGraph"; description = "GLib/GObject wrapper for the Facebook Graph API"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix index 51c13f97433..a690d8f2e15 100644 --- a/pkgs/development/libraries/gflags/default.nix +++ b/pkgs/development/libraries/gflags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ library that implements commandline flags processing"; longDescription = '' The gflags package contains a C++ library that implements commandline flags processing. diff --git a/pkgs/development/libraries/ggz_base_libs/default.nix b/pkgs/development/libraries/ggz_base_libs/default.nix index 6003c5ea33e..025423ecd8a 100644 --- a/pkgs/development/libraries/ggz_base_libs/default.nix +++ b/pkgs/development/libraries/ggz_base_libs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, openssl, expat, libgcrypt }: +{ lib, stdenv, fetchurl, intltool, openssl, expat, libgcrypt }: stdenv.mkDerivation rec { version = "0.99.5"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "--with-tls" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GGZ Gaming zone libraries"; maintainers = with maintainers; [ diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index 2cb7a9dfe54..e66f7bfe2a8 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper, imlib2 }: +{ lib, stdenv, fetchurl, xlibsWrapper, imlib2 }: stdenv.mkDerivation rec { name = "giblib-1.2.4"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://linuxbrit.co.uk/giblib/"; description = "wrapper library for imlib2, and other stuff"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; + platforms = lib.platforms.unix; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/giflib/4.1.nix b/pkgs/development/libraries/giflib/4.1.nix index 954e508152c..c0afe067c49 100644 --- a/pkgs/development/libraries/giflib/4.1.nix +++ b/pkgs/development/libraries/giflib/4.1.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "giflib-4.1.6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for reading and writing gif images"; branch = "4.1"; license = licenses.mit; diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index e2ff96d366a..9eaf7b933d4 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames }: stdenv.mkDerivation rec { name = "giflib-5.2.1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii"; }; - patches = stdenv.lib.optional stdenv.hostPlatform.isDarwin + patches = lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { # https://sourceforge.net/p/giflib/bugs/133/ name = "darwin-soname.patch"; @@ -21,15 +21,15 @@ stdenv.mkDerivation rec { --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}' ''; - nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; meta = { description = "A library for reading and writing gif images"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + platforms = lib.platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; branch = "5.2"; }; } diff --git a/pkgs/development/libraries/giflib/libungif.nix b/pkgs/development/libraries/giflib/libungif.nix index 30cfa0db86a..d8c32d14fca 100644 --- a/pkgs/development/libraries/giflib/libungif.nix +++ b/pkgs/development/libraries/giflib/libungif.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "libungif-4.1.4"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library and utilities for processing GIFs"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index f315679c9b7..91fbb86bd66 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, which, pkg-config, mono, glib, gtk-sharp-2_0 }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, which, pkg-config, mono, glib, gtk-sharp-2_0 }: stdenv.mkDerivation rec { pname = "gio-sharp"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ./autogen-2.22.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GIO API bindings"; homepage = "https://github.com/mono/gio-sharp"; license = licenses.mit; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index edbb3d82241..a118a611785 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, python3 +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, python3 , zlib, libssh2, openssl, pcre, http-parser , libiconv, Security }: @@ -23,16 +23,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 pkg-config ]; buildInputs = [ zlib libssh2 openssl pcre http-parser ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security; - propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; doCheck = false; # hangs. or very expensive? meta = { description = "The Git linkable library"; homepage = "https://libgit2.github.com/"; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.gpl2; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix index 1de84afe621..dfd6b6b476b 100644 --- a/pkgs/development/libraries/givaro/3.7.nix +++ b/pkgs/development/libraries/givaro/3.7.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}: +{lib, stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}: stdenv.mkDerivation rec { pname = "givaro"; version = "3.7.2"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "A C++ library for arithmetic and algebraic computations"; - license = stdenv.lib.licenses.cecill-b; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.cecill-b; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix index fc9bb18988f..9d216b9d8e5 100644 --- a/pkgs/development/libraries/givaro/3.nix +++ b/pkgs/development/libraries/givaro/3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}: +{lib, stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}: stdenv.mkDerivation rec { pname = "givaro"; version = "3.8.0"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "A C++ library for arithmetic and algebraic computations"; - license = stdenv.lib.licenses.cecill-b; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.cecill-b; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 4da5a0cb75c..f6d6ddab4d0 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }: +{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }: stdenv.mkDerivation rec { pname = "givaro"; version = "4.1.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-optimization" - ] ++ stdenv.lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "A C++ library for arithmetic and algebraic computations"; - license = stdenv.lib.licenses.cecill-b; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.cecill-b; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 5bcea279819..a6b37c5efcc 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -1,6 +1,6 @@ { fetchurl , fetchpatch -, stdenv +, lib, stdenv , meson , ninja , pkg-config @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { version = "1.66.1"; src = fetchurl { - url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0k1ld2bc4c3zbyjpfgx15v5n02iywdvm106rys5jqr7zbr2l0hld"; }; @@ -105,7 +105,7 @@ in stdenv.mkDerivation rec { postFixup = '' wrapProgram "$installedTests/libexec/installed-tests/gjs/minijasmine" \ --prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \ - --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}" + --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" testDeps}" ''; checkPhase = '' @@ -127,7 +127,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "JavaScript bindings for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix index 172531f9dc7..0203e2fde93 100644 --- a/pkgs/development/libraries/gl2ps/default.nix +++ b/pkgs/development/libraries/gl2ps/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , zlib @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { freeglut ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://geuz.org/gl2ps"; description = "An OpenGL to PostScript printing library"; platforms = platforms.all; diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index 9b67b9695cc..1b36baa24e4 100644 --- a/pkgs/development/libraries/glbinding/default.nix +++ b/pkgs/development/libraries/glbinding/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }: +{ lib, stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }: stdenv.mkDerivation rec { pname = "glbinding"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU xlibsWrapper ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cginternals/glbinding/"; description = "A C++ binding for the OpenGL API, generated using the gl.xml specification"; license = licenses.mit; diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix index d0667b0f270..b7a4f7f2fef 100644 --- a/pkgs/development/libraries/gle/default.nix +++ b/pkgs/development/libraries/gle/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, freeglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}: +{lib, stdenv, fetchurl, freeglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}: stdenv.mkDerivation { name = "gle-3.1.0"; buildInputs = [libGLU libGL freeglut libX11 libXt libXmu libXi libXext]; @@ -11,8 +11,8 @@ stdenv.mkDerivation { }; meta = { description = "Tubing and extrusion library"; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 139b93c039e..29376cb2567 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi +{ lib, stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi , AGL, OpenGL }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "glew-1.10.0"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "SYSTEM=${if stdenv.hostPlatform.isMinGW then "mingw" else stdenv.hostPlatform.parsed.kernel.name}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An OpenGL extension loading library for C(++)"; homepage = "http://glew.sourceforge.net/"; license = licenses.free; # different files under different licenses diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 3b067e6d0f3..660276530aa 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi +{ lib, stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi , OpenGL }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "glew-2.2.0"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "An OpenGL extension loading library for C(++)"; homepage = "http://glew.sourceforge.net/"; license = licenses.free; # different files under different licenses diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix index ca65315e1cb..d05fa6e5f77 100644 --- a/pkgs/development/libraries/glfw/2.x.nix +++ b/pkgs/development/libraries/glfw/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU, libGL, libX11, libXext }: +{ lib, stdenv, fetchurl, libGLU, libGL, libX11, libXext }: stdenv.mkDerivation rec { name = "glfw-2.7.9"; @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { ln -s libglfw.so.2 $out/lib/libglfw.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; homepage = "http://glfw.sourceforge.net/"; license = licenses.zlib; - maintainers = [ stdenv.lib.maintainers.marcweber ]; + maintainers = [ lib.maintainers.marcweber ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 62c1c596d2c..8698b71567e 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { substituteInPlace src/glx_context.c --replace "libGL.so.1" "${lib.getLib libGL}/lib/libGL.so.1" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; homepage = "https://www.glfw.org/"; license = licenses.zlib; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 31e066e8a25..58589734166 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , substituteAll , meson @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16807qwflbghp0c66jdx2gnaffvdp4bla35ppzp9dlgx6wjbxmy5"; }; @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Network-related giomodules for glib"; homepage = "https://gitlab.gnome.org/GNOME/glib-networking"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/glib-testing/default.nix b/pkgs/development/libraries/glib-testing/default.nix index b04cbfe36d0..bdbced24a10 100644 --- a/pkgs/development/libraries/glib-testing/default.nix +++ b/pkgs/development/libraries/glib-testing/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , meson , ninja @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Test library providing test harnesses and mock classes complementing the classes provided by GLib"; homepage = "https://gitlab.gnome.org/pwithnall/libglib-testing"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index da1eb076536..a67ea503776 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3 +{ config, lib, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3 , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) , util-linuxMinimal ? null @@ -11,7 +11,7 @@ , darwin, fetchpatch }: -with stdenv.lib; +with lib; assert stdenv.isLinux -> util-linuxMinimal != null; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { version = "2.66.4"; src = fetchurl { - url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "l9+GcOMvn9T3OSsJgOZh3WJQEgFdWDUNoeWOND9K+YQ="; }; @@ -182,7 +182,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = "glib"; }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C library of programming buildings blocks"; homepage = "https://www.gtk.org/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 150681ebda1..9043c8fd0d4 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage +{ lib, stdenv, callPackage , withLinuxHeaders ? true , profilingLibraries ? false , withGd ? false @@ -14,7 +14,7 @@ let in callPackage ./common.nix { inherit stdenv; } { - name = "glibc" + stdenv.lib.optionalString withGd "-gd"; + name = "glibc" + lib.optionalString withGd "-gd"; inherit withLinuxHeaders profilingLibraries withGd; @@ -46,15 +46,15 @@ callPackage ./common.nix { inherit stdenv; } { hardeningDisable = [ "stackprotector" "fortify" ] # XXX: Not actually musl-speciic but since only musl enables pie by default, # limit rebuilds by only disabling pie w/musl - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie"; + ++ lib.optional stdenv.hostPlatform.isMusl "pie"; - NIX_CFLAGS_COMPILE = stdenv.lib.concatStringsSep " " + NIX_CFLAGS_COMPILE = lib.concatStringsSep " " (builtins.concatLists [ - (stdenv.lib.optionals withGd gdCflags) + (lib.optionals withGd gdCflags) # Fix -Werror build failure when building glibc with musl with GCC >= 8, see: # https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798 - (stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias") - (stdenv.lib.optionals ((stdenv.hostPlatform != stdenv.buildPlatform) || stdenv.hostPlatform.isMusl) [ + (lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias") + (lib.optionals ((stdenv.hostPlatform != stdenv.buildPlatform) || stdenv.hostPlatform.isMusl) [ # Ignore "error: '__EI___errno_location' specifies less restrictive attributes than its target '__errno_location'" # New warning as of GCC 9 # Same for musl: https://github.com/NixOS/nixpkgs/issues/78805 @@ -81,14 +81,14 @@ callPackage ./common.nix { inherit stdenv; } { postInstall = (if stdenv.hostPlatform == stdenv.buildPlatform then '' echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales - '' else stdenv.lib.optionalString stdenv.buildPlatform.isLinux '' + '' else lib.optionalString stdenv.buildPlatform.isLinux '' # This is based on http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html # Instead of using their patch to build a build-native localedef, # we simply use the one from buildPackages pushd ../glibc-2*/localedata export I18NPATH=$PWD GCONV_PATH=$PWD/../iconvdata mkdir -p $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale - ${stdenv.lib.getBin buildPackages.glibc}/bin/localedef \ + ${lib.getBin buildPackages.glibc}/bin/localedef \ --alias-file=../intl/locale.alias \ -i locales/C \ -f charmaps/UTF-8 \ @@ -122,7 +122,7 @@ callPackage ./common.nix { inherit stdenv; } { '' # For some reason these aren't stripped otherwise and retain reference # to bootstrap-tools; on cross-arm this stripping would break objects. - + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' for i in "$out"/lib/*.a; do [ "$i" = "$out/lib/libm.a" ] || $STRIP -S "$i" diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index 0dc19197415..238cebf6209 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -6,7 +6,7 @@ https://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/SUPPORTED */ -{ stdenv, buildPackages, callPackage, writeText +{ lib, stdenv, buildPackages, callPackage, writeText , allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ] }: @@ -31,9 +31,9 @@ callPackage ./common.nix { inherit stdenv; } { # Hack to allow building of the locales (needed since glibc-2.12) sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile '' - + stdenv.lib.optionalString (!allLocales) '' + + lib.optionalString (!allLocales) '' # Check that all locales to be built are supported - echo -n '${stdenv.lib.concatMapStrings (s: s + " \\\n") locales}' \ + echo -n '${lib.concatMapStrings (s: s + " \\\n") locales}' \ | sort > locales-to-build.txt cat ../glibc-2*/localedata/SUPPORTED | grep ' \\' \ | sort > locales-supported.txt diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index c737ee9ec45..19567a98721 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin }: +{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin }: stdenv.mkDerivation rec { pname = "glibmm"; version = "2.64.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { glib # for glib-compile-schemas ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa ]); propagatedBuildInputs = [ glib libsigcxx ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ interface to the GLib library"; homepage = "https://gtkmm.org/"; diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index cb0ae47acde..f5652a61c1d 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, cmake }: +{ lib, stdenv, fetchurl, fetchzip, cmake }: stdenv.mkDerivation rec { version = "0.9.8.5"; @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { cp ${gcc7PlatformPatch} glm/simd/platform.h ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-DGLM_COMPILER=0"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGLM_COMPILER=0"; postInstall = '' mkdir -p $doc/share/doc/glm cp -rv $NIX_BUILD_TOP/$sourceRoot/doc/* $doc/share/doc/glm ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenGL Mathematics library for C++"; longDescription = '' OpenGL Mathematics (GLM) is a header only C++ mathematics library for @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = "http://glm.g-truc.net/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 5f700f73515..049e262bb17 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook , blas, gfortran, openssh, openmpi } : @@ -30,7 +30,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Global Arrays Programming Models"; homepage = "http://hpc.pnl.gov/globalarrays/"; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix index 6f53cda536a..a8dfa430f59 100644 --- a/pkgs/development/libraries/globalplatform/default.nix +++ b/pkgs/development/libraries/globalplatform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, zlib, openssl_1_0_2, pcsclite }: +{ lib, stdenv, fetchurl, pkg-config, zlib, openssl_1_0_2, pcsclite }: stdenv.mkDerivation rec { pname = "globalplatform"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib openssl_1_0_2 pcsclite ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/"; description = "Library for interacting with smart card devices"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix index 33a6954d695..a3ea4305bea 100644 --- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix +++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, globalplatform, openssl_1_0_2, pcsclite }: +{ lib, stdenv, fetchurl, pkg-config, globalplatform, openssl_1_0_2, pcsclite }: stdenv.mkDerivation rec { pname = "gppcscconnectionplugin"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ globalplatform openssl_1_0_2 pcsclite ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/"; description = "GlobalPlatform pcsc connection plugin"; license = [ licenses.lgpl3 licenses.gpl3 ]; diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index aa846e41d55..4bb20ebfd93 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails with "Mangled symbols (28 out of 380) found in demangle.dm" - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/google/glog"; license = licenses.bsd3; description = "Library for application-level logging"; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index ef731b3c35a..b01d858cfb9 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , zlibSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , idnSupport ? true, libidn ? null @@ -8,7 +8,7 @@ assert zlibSupport -> zlib != null; assert sslSupport -> openssl != null; assert idnSupport -> libidn != null; -with stdenv.lib; +with lib; let version = "1.0.24"; diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index d771f7df789..a46c84844e8 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , libmysqlclient @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { buildInputs = [ libmysqlclient - ] ++ stdenv.lib.optionals withGmp [ + ] ++ lib.optionals withGmp [ gmp ]; - configureFlags = stdenv.lib.optionals withGmp [ + configureFlags = lib.optionals withGmp [ "--with-gmp" ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The GNU Linear Programming Kit"; longDescription = diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/development/libraries/glui/default.nix index d84a9227c3b..5eead23b825 100644 --- a/pkgs/development/libraries/glui/default.nix +++ b/pkgs/development/libraries/glui/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , freeglut , libGL @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cp LICENSE.txt "$out/share/glui/doc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = ''A user interface library using OpenGL''; license = licenses.zlib ; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix index 05bb4018229..0e10d12ed1f 100644 --- a/pkgs/development/libraries/gmime/2.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, glib, zlib, gnupg, libgpgerror, gobject-introspection }: +{ lib, stdenv, fetchurl, pkg-config, glib, zlib, gnupg, libgpgerror, gobject-introspection }: stdenv.mkDerivation rec { version = "2.6.23"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jstedfast/gmime/"; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 01ddde2ca89..a8e39047256 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection +{ lib, stdenv, fetchurl, pkg-config, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection , vala }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jstedfast/gmime/"; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index 278059465ec..3c145b3c1e3 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "gmm"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0mhygfpsdyr0d4h3sn6g7nxn149yrlqv7r2h34yqkrpv1q4daqvi"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Generic C++ template library for sparse, dense and skyline matrices"; homepage = "http://getfem.org/gmm.html"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index 29310aa9f00..ce870581f5e 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, cxx ? true }: +{ lib, stdenv, fetchurl, m4, cxx ? true }: let self = stdenv.mkDerivation rec { name = "gmp-4.3.2"; @@ -28,8 +28,8 @@ let self = stdenv.mkDerivation rec { else ''echo "Darwin host is `./config.guess`."''; configureFlags = [ - (stdenv.lib.enableFeature cxx "cxx") - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + (lib.enableFeature cxx "cxx") + ] ++ lib.optionals stdenv.isDarwin [ "ac_cv_build=x86_64-apple-darwin13.4.0" "ac_cv_host=x86_64-apple-darwin13.4.0" ]; @@ -65,10 +65,10 @@ let self = stdenv.mkDerivation rec { ''; homepage = "https://gmplib.org/"; - license = stdenv.lib.licenses.lgpl3Plus; + license = lib.licenses.lgpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; badPlatforms = [ "x86_64-darwin" ]; }; }; diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index a514934e964..73061a3d2ef 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, m4 +{ lib, stdenv, fetchurl, m4 , cxx ? true , withStatic ? stdenv.hostPlatform.isStatic }: -let inherit (stdenv.lib) optional; in +let inherit (lib) optional; in let self = stdenv.mkDerivation rec { name = "gmp-5.1.3"; @@ -25,13 +25,13 @@ let self = stdenv.mkDerivation rec { configureFlags = [ "--with-pic" - (stdenv.lib.enableFeature cxx "cxx") + (lib.enableFeature cxx "cxx") # Build a "fat binary", with routines for several sub-architectures # (x86), except on Solaris where some tests crash with "Memory fault". # See , for instance. # # no darwin because gmp uses ASM that clang doesn't like - (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + (lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. @@ -46,7 +46,7 @@ let self = stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gmplib.org/"; description = "GNU multiple precision arithmetic library"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 522976d3ab2..bf03bf08779 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4 +{ lib, stdenv, fetchurl, m4 , cxx ? !stdenv.hostPlatform.useAndroidPrebuilt && !stdenv.hostPlatform.isWasm , buildPackages , withStatic ? stdenv.hostPlatform.isStatic @@ -9,7 +9,7 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -let inherit (stdenv.lib) optional; in +let inherit (lib) optional; in let self = stdenv.mkDerivation rec { name = "gmp-6.2.1"; @@ -30,13 +30,13 @@ let self = stdenv.mkDerivation rec { configureFlags = [ "--with-pic" - (stdenv.lib.enableFeature cxx "cxx") + (lib.enableFeature cxx "cxx") # Build a "fat binary", with routines for several sub-architectures # (x86), except on Solaris where some tests crash with "Memory fault". # See , for instance. # # no darwin because gmp uses ASM that clang doesn't like - (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + (lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. @@ -54,7 +54,7 @@ let self = stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gmplib.org/"; description = "GNU multiple precision arithmetic library"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix index 81e33c39a7d..6f2906a8234 100644 --- a/pkgs/development/libraries/gmtk/default.nix +++ b/pkgs/development/libraries/gmtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, substituteAll, fetchFromGitHub, libtool, pkg-config, intltool, glib, gtk3 +{lib, stdenv, substituteAll, fetchFromGitHub, libtool, pkg-config, intltool, glib, gtk3 , libpulseaudio, mplayer, gnome_mplayer }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Common functions for gnome-mplayer and gecko-mediaplayer"; homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index 91522e3f126..8f35407f9dd 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkg-config, autoconf, automake, glib, libtool }: +{lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, glib, libtool }: stdenv.mkDerivation { name = "gnet-2.0.8"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "A network library, written in C, object-oriented, and built upon GLib"; homepage = "https://developer.gnome.org/gnet/"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index 3d4d8be3f1a..c8e77148c6d 100644 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-menus"; version = "3.36.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "07xvaf8s0fiv0035nk8zpzymn5www76w2a1vflrgqmp9plw8yd6r"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-menus"; description = "Library that implements freedesktops's Desktop Menu Specification in GNOME"; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 342cfcbc4da..c5846b523cd 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , pkg-config , vala @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GnomeOnlineAccounts"; description = "Single sign-on framework for GNOME"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index efd95d0f973..4aa510f3606 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.mono-project.com/docs/gui/gtksharp/"; description = "A .NET language binding for assorted GNOME libraries"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix index 41a0cb297c4..a2206c19b1b 100644 --- a/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , meson @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "0.5.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1j6h98whgkcxrh30bwvnxvyqxrxchgpdgqhl0j71xz7x72dqxijd"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of GStreamer effects to be used in different GNOME Modules"; homepage = "https://wiki.gnome.org/Projects/GnomeVideoEffects"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index 5acab2a70e0..74b94e68f56 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let rev = "e78c96e5288993aaea3ec44e5c6ee755c668da79"; @@ -22,7 +22,7 @@ in stdenv.mkDerivation { cp ${configSub} $out/config.sub ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Attempt to guess a canonical system name"; homepage = "https://savannah.gnu.org/projects/config"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 402c3585d53..ef8ef7648eb 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPackages, fetchurl, fetchpatch, pciutils }: +{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pciutils }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "gnu-efi"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GNU EFI development toolchain"; homepage = "https://sourceforge.net/projects/gnu-efi/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 97b3ea9a8f1..ae65f5aed28 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , glib , flex @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x"; }; @@ -46,12 +46,12 @@ stdenv.mkDerivation rec { src = ./absolute_shlib_path.patch; inherit nixStoreDir; }) - ] ++ stdenv.lib.optionals x11Support [ + ] ++ lib.optionals x11Support [ # Hardcode the cairo shared library path in the Cairo gir shipped with this package. # https://github.com/NixOS/nixpkgs/issues/34080 (substituteAll { src = ./absolute_gir_path.patch; - cairoLib = "${stdenv.lib.getLib cairo}/lib"; + cairoLib = "${lib.getLib cairo}/lib"; }) ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { python3 ]; - checkInputs = stdenv.lib.optionals stdenv.isDarwin [ + checkInputs = lib.optionals stdenv.isDarwin [ cctools # for otool ]; @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A middleware layer between C libraries and language bindings"; homepage = "https://gi.readthedocs.io/"; maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 ]); diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index d9cffbc228e..d544dd7625d 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkg-config, intltool, glib, gtk3, lasem +{ fetchurl, lib, stdenv, pkg-config, intltool, glib, gtk3, lasem , libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome3 }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4"; }; @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { documents, undo/redo. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index 2be144fc4c6..4b5effefa57 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "py" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17ca07hpg7dqxjn0jpqim3xqcmplk2a87wbwrrlq3dd3m8381l38"; }; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A GObject to SQLite object mapper"; homepage = "https://wiki.gnome.org/Projects/Gom"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index ae583f5ac8b..c4df9f1f0fd 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }: let version = "2.0.4"; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; - meta = with stdenv.lib; { + meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 825e0cbe194..c9fd5b26342 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, gtk2, cairo, glib, pkg-config, gnome3 }: +{ lib, stdenv, fetchurl, gtk2, cairo, glib, pkg-config, gnome3 }: stdenv.mkDerivation rec { pname = "goocanvas"; version = "1.0.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "07kicpcacbqm3inp7zq32ldp95mxx4kfxpaazd0x5jk7hpw2w1qw"; }; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; license = licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix index e68094f9d52..632e434631c 100644 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, goocanvas2, gtkmm3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, goocanvas2, gtkmm3, gnome3 }: stdenv.mkDerivation rec { pname = "goocanvasmm"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0vpdfrj59nwzwj8bk4s0h05iyql62pxjzsxh72g3vry07s3i3zw0"; }; nativeBuildInputs = [ pkg-config ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ bindings for GooCanvas"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index a3a549a6324..fdf42543281 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, clang-tools, grpc, curl, cmake, pkg-config, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }: +{ lib, stdenv, clang-tools, grpc, curl, cmake, pkg-config, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }: let googleapis = fetchFromGitHub { owner = "googleapis"; @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS:BOOL=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { license = with licenses; [ asl20 ]; homepage = "https://github.com/googleapis/google-cloud-cpp"; description = "C++ Idiomatic Clients for Google Cloud Platform services"; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 4b96b493cf5..5b24955af43 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gnupg.org/software/gpgme/index.html"; changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=NEWS;hb=refs/tags/gpgme-${version}"; description = "Library for making GnuPG easier to use"; diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix index bd1c8434949..b11ec3a9f5c 100644 --- a/pkgs/development/libraries/grail/default.nix +++ b/pkgs/development/libraries/grail/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true, - stdenv, fetchurl, pkg-config, xorg, python3, frame }: + lib, stdenv, fetchurl, pkg-config, xorg, python3, frame }: stdenv.mkDerivation rec { pname = "grail"; @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ python3 frame ] - ++ stdenv.lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes]; + ++ lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes]; - configureFlags = stdenv.lib.optional enableX11 "--with-x11"; + configureFlags = lib.optional enableX11 "--with-x11"; meta = { homepage = "https://launchpad.net/canonical-multitouch/grail"; description = "Gesture Recognition And Instantiation Library"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index 627a345efad..869430538e8 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, cmake }: +{ lib, stdenv, fetchurl, qt4, cmake }: stdenv.mkDerivation rec { name = "grantlee-0.5.1"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { and the design of Django is reused in Grantlee.''; homepage = "http://gitorious.org/grantlee"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/development/libraries/graphene-hardened-malloc/default.nix index c60b0914492..726666ec06f 100644 --- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "graphene-hardened-malloc"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/GrapheneOS/hardened_malloc"; description = "Hardened allocator designed for modern systems"; longDescription = '' diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index f72b354f161..57cad449765 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pkg-config @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A thin layer of graphic data types"; homepage = "https://ebassi.github.com/graphene"; license = licenses.mit; diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index 0a057ba4aa1..182f05a8ca8 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, +{ fetchurl, fetchpatch, lib, stdenv, cmake, netcdf, gfortran, libpng, openjpeg, enablePython ? false, pythonPackages }: @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { buildInputs = [ netcdf libpng openjpeg - ] ++ stdenv.lib.optionals enablePython [ + ] ++ lib.optionals enablePython [ pythonPackages.python ]; - propagatedBuildInputs = stdenv.lib.optionals enablePython [ + propagatedBuildInputs = lib.optionals enablePython [ pythonPackages.numpy ]; @@ -46,14 +46,14 @@ stdenv.mkDerivation rec { # Only do tests that don't require downloading 120MB of testdata # We fix the darwin checkPhase, which searches for libgrib_api.dylib # in /nix/store by setting DYLD_LIBRARY_PATH - checkPhase = stdenv.lib.optionalString (stdenv.isDarwin) '' + checkPhase = lib.optionalString (stdenv.isDarwin) '' substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib" '' + '' ctest -R "t_definitions|t_calendar|t_unit_tests" -VV ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home"; license = licenses.asl20; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 07bad7745d6..b80e6256e46 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , substituteAll , meson @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { version = "0.3.12"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xr59gzb8gw2bgj14mjllgn8y7srh373j0fp0v16ak8nd84dzdn6"; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # * chromaprint (gst-plugins-bad) (substituteAll { src = ./chromaprint-gst-plugins.patch; - load_plugins = stdenv.lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [ + load_plugins = lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "A collection of plugins for the Grilo framework"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index 7a3667af880..fbab49273e8 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43 , libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }: @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i"; }; @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index e24967eb30f..92cf619ab5b 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf , gflags, abseil-cpp, libnsl }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ] - ++ stdenv.lib.optionals stdenv.isLinux [ libnsl ]; + ++ lib.optionals stdenv.isLinux [ libnsl ]; cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option"; enableParallelBuilds = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"; license = licenses.asl20; maintainers = [ maintainers.lnl7 maintainers.marsam ]; diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 4e22c38e9c8..48ee0ddd4a5 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libidn, kerberos }: +{ fetchurl, lib, stdenv, libidn, kerberos }: stdenv.mkDerivation rec { name = "gsasl-1.8.0"; @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/gsasl/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ shlevy ]; - platforms = stdenv.lib.platforms.all; + maintainers = with lib.maintainers; [ shlevy ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 3c6b2688b77..318d07dfacc 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , glib @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0rwcg9sd5rv7gjwapcd1jjk6l16w0p3j7wkicq1rdch4c0kch12p"; }; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of GSettings schemas for settings shared by various components of a desktop"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix index 9bb6bd17f40..21b63875db6 100644 --- a/pkgs/development/libraries/gsettings-qt/default.nix +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkg-config +{ lib, stdenv, fetchFromGitLab, pkg-config , qmake, qtbase, qtdeclarative, wrapQtAppsHook , glib, gobject-introspection , genericUpdater, common-updater-scripts @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to access GSettings from Qt"; homepage = "https://gitlab.com/ubports/core/gsettings-qt"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix index dda751acfb1..92123dbc3ea 100644 --- a/pkgs/development/libraries/gsignond/default.nix +++ b/pkgs/development/libraries/gsignond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, glib-networking +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, glib-networking , sqlite, gobject-introspection, vala, gtk-doc, libsecret, docbook_xsl , docbook_xml_dtd_43, docbook_xml_dtd_45, glibcLocales, makeWrapper , symlinkJoin, gsignondPlugins, plugins }: @@ -50,7 +50,7 @@ unwrapped = stdenv.mkDerivation rec { ./plugin-load-env.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Bus service which performs user authentication on behalf of its clients"; homepage = "https://gitlab.com/accounts-sso/gsignond"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index 72d1a8e90ff..a05069f205f 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: stdenv.mkDerivation { pname = "gsignond-plugin-lastfm"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-lastfm"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix index 240d47f6dd2..8bce32f976a 100644 --- a/pkgs/development/libraries/gsignond/plugins/mail.nix +++ b/pkgs/development/libraries/gsignond/plugins/mail.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, gobject-introspection }: +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, gobject-introspection }: stdenv.mkDerivation rec { pname = "gsignond-plugin-mail"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-mail"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index b1d673eea95..3bf3ab19464 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, check +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, check , json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 , docbook_xsl, glibcLocales, gobject-introspection }: @@ -38,7 +38,7 @@ stdenv.mkDerivation { PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-oa"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix index 8fc63383831..b73559f8a53 100644 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, gsasl, check +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, gsasl, check , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }: stdenv.mkDerivation { @@ -35,7 +35,7 @@ stdenv.mkDerivation { PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-sasl"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 4a9208cff32..04c8bcbbbec 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { name = "gsl-2.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isx86_64 "-mno-fma"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html doCheck = stdenv.hostPlatform.system != "i686-linux" && stdenv.hostPlatform.system != "aarch64-linux"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; homepage = "https://www.gnu.org/software/gsl/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' The GNU Scientific Library (GSL) is a numerical library for C @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { fitting. There are over 1000 functions in total with an extensive test suite. ''; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index 9a31563c6cc..d2665187575 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv }: +{ fetchurl, fetchpatch, lib, stdenv }: stdenv.mkDerivation rec { name = "gsl-1.16"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isx86_64 "-mno-fma"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma"; patches = [ (fetchpatch { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; homepage = "https://www.gnu.org/software/gsl/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' The GNU Scientific Library (GSL) is a numerical library for C @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { fitting. There are over 1000 functions in total with an extensive test suite. ''; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; # Failing "eigen" tests on aarch64. badPlatforms = [ "aarch64-linux" ]; }; diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 7214aa6f6b9..13088dda0c9 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , # Compile statically (support for packages that look for the static object) staticSupport ? stdenv.hostPlatform.isStatic }: let inherit (stdenv) isDarwin; - inherit (stdenv.lib) optional optionalString; + inherit (lib) optional optionalString; in stdenv.mkDerivation rec { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { parallelBuild = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Lossy speech compression codec"; homepage = "http://www.quut.com/gsm/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/gsmlib/default.nix b/pkgs/development/libraries/gsmlib/default.nix index 88bec83e624..ec6646d98f5 100644 --- a/pkgs/development/libraries/gsmlib/default.nix +++ b/pkgs/development/libraries/gsmlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "gsmlib"; version = "unstable-2017-10-06"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "16v8aj914ac1ipf14a867ljib3gy7fhzd9ypxnsg9l0zi8mm3ml5"; }; nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to access GSM mobile phones through GSM modems"; homepage = "https://github.com/x-logLT/gsmlib"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix index 2614c50cca7..08b8146ac0a 100644 --- a/pkgs/development/libraries/gsoap/default.nix +++ b/pkgs/development/libraries/gsoap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, unzip, m4, bison, flex, openssl, zlib }: +{ lib, stdenv, fetchurl, autoreconfHook, unzip, m4, bison, flex, openssl, zlib }: let majorVersion = "2.8"; @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { --replace 'AM_INIT_AUTOMAKE([foreign])' 'AM_INIT_AUTOMAKE([foreign subdir-objects])' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C/C++ toolkit for SOAP web services and XML-based applications"; homepage = "http://www.cs.fsu.edu/~engelen/soap.html"; # gsoap is dual/triple licensed (see homepage for details): diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index 9fc099fd3dd..2a3e846d38d 100644 --- a/pkgs/development/libraries/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }: stdenv.mkDerivation rec { pname = "gsound"; version = "1.0.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GSound"; description = "Small library for playing system sounds"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index a240db6c04d..890fcb98118 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , libxml2 @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pdb4gbjrs8mk6r0ipw5vxyvzav1wvkjq46kiq53r3nyznfpdfyw"; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A spell-checking library for GTK applications"; homepage = "https://wiki.gnome.org/Projects/gspell"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 363e7ba7d10..ec4e54c339b 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , withShishi ? !stdenv.isDarwin, shishi ? null }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz"; }; - buildInputs = stdenv.lib.optional withShishi shishi; + buildInputs = lib.optional withShishi shishi; configureFlags = [ "--${if withShishi != null then "enable" else "disable"}-kereberos5" @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { doCheck = true; # Fixup .la files - postInstall = stdenv.lib.optionalString withShishi '' + postInstall = lib.optionalString withShishi '' sed -i 's,\(-lshishi\),-L${shishi}/lib \1,' $out/lib/libgss.la ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/gss/"; description = "Generic Security Service"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 0ab377c2e29..440caba2547 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1s57i8a8wnnxnsfl27cq4503dkdlzbrhry5zpg23sfqfffvdqqx2"; }; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = "http://www.gupnp.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 58b33f6c2f9..313a063cae8 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , meson @@ -86,7 +86,7 @@ assert faacSupport -> faac != null; let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "gst-plugins-bad"; version = "1.18.2"; @@ -293,7 +293,7 @@ in stdenv.mkDerivation rec { doCheck = false; # fails 20 out of 58 tests, expensive - meta = with stdenv.lib; { + meta = with lib; { description = "GStreamer Bad Plugins"; homepage = "https://gstreamer.freedesktop.org"; longDescription = '' diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 1665c7f8a13..dc53a76bbca 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Integration testing infrastructure for the GStreamer framework"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 4ccb2e2c286..ebd5f83dd15 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { scripts/extract-release-date-from-doap-file.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for creation of audio/video non-linear editors"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 4bbdfdad69d..a032f5f5b5a 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , nasm @@ -47,7 +47,7 @@ assert gtkSupport -> gtk3 != null; assert raspiCameraSupport -> ((libraspberrypi != null) && stdenv.isLinux && stdenv.isAarch64); let - inherit (stdenv.lib) optionals; + inherit (lib) optionals; in stdenv.mkDerivation rec { pname = "gst-plugins-good"; @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''" doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "GStreamer Good Plugins"; homepage = "https://gstreamer.freedesktop.org"; longDescription = '' diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 51d0fcc8efd..2c683a84da4 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome3 }: stdenv.mkDerivation rec { pname = "gstreamermm"; version = "1.10.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0q4dx9sncqbwgpzma0zvj6zssc279yl80pn8irb95qypyyggwn5y"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ interface for GStreamer"; homepage = "https://gstreamer.freedesktop.org/bindings/cplusplus.html"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 16de3a6e65f..bcecd11ce2d 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { scripts/extract-release-date-from-doap-file.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GStreamer RTSP server"; homepage = "https://gstreamer.freedesktop.org"; longDescription = '' diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index e758568b2bb..a90d21c28e8 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { scripts/extract-release-date-from-doap-file.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of VAAPI GStreamer Plug-ins"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index 7b25d6dd725..1dbcd37cf4b 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkg-config}: +{lib, stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkg-config}: let s = # Generated upstream information rec { @@ -24,9 +24,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''Cross-platform helper for creating interactive dialogs''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://foicica.com/gtdialog"; downloadPage = "http://foicica.com/gtdialog/download"; }; diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 4e8ce95737d..d15ce77213c 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, ninja, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, cmake, ninja, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "gtest"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Google's framework for writing C++ tests"; homepage = "https://github.com/google/googletest"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix index 2da9847f3cb..990e151efe4 100644 --- a/pkgs/development/libraries/gthree/default.nix +++ b/pkgs/development/libraries/gthree/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , ninja @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { "-Dexamples=false" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GObject/GTK port of three.js"; homepage = "https://github.com/alexlarsson/gthree"; license = licenses.mit; diff --git a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix index e595f6bf02d..84920060c5e 100644 --- a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix +++ b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, intltool, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }: stdenv.mkDerivation { name = "gtk-engine-bluecurve-1.0"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { meta = { description = "Original Bluecurve engine from Red Hat's artwork package"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.gnidorah ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.gnidorah ]; }; } diff --git a/pkgs/development/libraries/gtk-engine-murrine/default.nix b/pkgs/development/libraries/gtk-engine-murrine/default.nix index f5ae9c0552d..8d40499fb62 100644 --- a/pkgs/development/libraries/gtk-engine-murrine/default.nix +++ b/pkgs/development/libraries/gtk-engine-murrine/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, intltool, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }: stdenv.mkDerivation rec { pname = "gtk-engine-murrine"; version = "0.98.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A very flexible theme engine"; homepage = "https://gitlab.gnome.org/Archive/murrine"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gtk-engines/default.nix b/pkgs/development/libraries/gtk-engines/default.nix index 077bb53443a..115547a72f7 100644 --- a/pkgs/development/libraries/gtk-engines/default.nix +++ b/pkgs/development/libraries/gtk-engines/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, intltool, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }: stdenv.mkDerivation { name = "gtk-engines-2.20.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Theme engines for GTK 2"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index 1aef590bb92..56693d24c7a 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { "-Ddocs=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ eonpatapon ]; diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index d6df10db176..f244a97edf2 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, glib, gtk-doc, gtk, gobject-introspection }: +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, glib, gtk-doc, gtk, gobject-introspection }: stdenv.mkDerivation rec { pname = "gtk-mac-integration"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { gtkdocize ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides integration for GTK applications into the Mac desktop"; license = licenses.lgpl21; homepage = "https://wiki.gnome.org/Projects/GTK/OSX/Integration"; diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix index 9daf3bb91e5..69ef71f1506 100644 --- a/pkgs/development/libraries/gtk-sharp-beans/default.nix +++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono, gtk-sharp-2_0, gio-sharp }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono, gtk-sharp-2_0, gio-sharp }: stdenv.mkDerivation rec { pname = "gtk-sharp-beans"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Binds some API from GTK that isn't in GTK# 2.12.x"; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index 5afcb2d285a..1e7c8653065 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { gtk = gtk2; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical User Interface Toolkit for mono and .Net"; homepage = "https://www.mono-project.com/docs/gui/gtksharp"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index 576ad670bdb..491656a0c68 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , pkg-config @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { builder = ./builder.sh; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34"; }; @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { }; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index bd1b15b59e2..43b7ff5f127 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg +{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg , gdk-pixbuf, xlibsWrapper, gobject-introspection , xineramaSupport ? stdenv.isLinux , cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null @@ -10,7 +10,7 @@ assert xineramaSupport -> xorg.libXinerama != null; assert cupsSupport -> cups != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "gtk+"; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index d802ee7e44f..21a87de4a16 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , pkg-config @@ -48,7 +48,7 @@ assert cupsSupport -> cups != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "gtk+3"; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; + url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; sha256 = "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc"; }; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index 89c674f09d5..ccaceabd4e9 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg +{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }: let @@ -129,7 +129,7 @@ in stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "D binding and OO wrapper for GTK"; homepage = "https://gtkd.org"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index 8246d80a10f..d7cca43841e 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "gtkdatabox-0.9.3.1"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { description = "GTK widget for displaying large amounts of numerical data"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index 65b6fd1b43d..438f7feab6c 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkg-config, gtk2 }: +{ fetchurl, lib, stdenv, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "gtkimageview-1.6.4"; @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { interpolation; GIF animation support. ''; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index d5a10171bdf..b5399553f96 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkg-config, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }: +{lib, stdenv, fetchurl, pkg-config, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }: let pname = "gtkmathview"; @@ -22,8 +22,8 @@ stdenv.mkDerivation { meta = { homepage = "http://helm.cs.unibo.it/mml-widget/"; description = "C++ rendering engine for MathML documents"; - license = stdenv.lib.licenses.lgpl3Plus; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + license = lib.licenses.lgpl3Plus; + maintainers = [ lib.maintainers.roconnor ]; broken = true; }; } diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 0e04cb710dc..521f4ca15f3 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, gtk2, glibmm, cairomm, pangomm, atkmm }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, glibmm, cairomm, pangomm, atkmm }: stdenv.mkDerivation rec { name = "gtkmm-${minVer}.5"; @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { homepage = "https://gtkmm.org/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ raskin vcunat ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ raskin vcunat ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 523cb5c59d8..4a31acd2ff6 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: stdenv.mkDerivation rec { pname = "gtkmm"; version = "3.24.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1hxdnhavjyvbcpxhd5z17l9fj4182028s66lc0s16qqqrldhjwbd"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ interface to the GTK graphical user interface library"; longDescription = '' diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index 870637202c4..84a20154b13 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala +{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala , libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }: stdenv.mkDerivation rec { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.24.11"; src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9"; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { make check ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 0254c096c14..2d469c191e0 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala +{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala , libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info , meson, ninja }: @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "4.8.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06jfbfbi73j9i3qsr7sxg3yl3643bn3aydbzx6xg3v8ca0hr3880"; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix index d05e1ebf83e..5e80f91abc1 100644 --- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome3 }: stdenv.mkDerivation rec { pname = "gtksourceviewmm"; version = "3.91.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "088p2ch1b4fvzl9416nw3waj0pqgp31cd5zj4lx5hzzrq2afgapy"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ glibmm gtkmm3 gtksourceview4 ]; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; homepage = "https://developer.gnome.org/gtksourceviewmm/"; description = "C++ wrapper for gtksourceview"; diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index 675ced4ee49..7ee6b656ead 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome3 }: stdenv.mkDerivation rec { pname = "gtksourceviewmm"; version = "3.21.3"; src = fetchurl { - url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gtksourceviewmm/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glibmm gtkmm3 gtksourceview3 ]; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; homepage = "https://developer.gnome.org/gtksourceviewmm/"; description = "C++ wrapper for gtksourceview"; diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index 721db5983d7..d3a1a178856 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk3, aspell, pkg-config, enchant, isocodes, intltool, gobject-introspection, vala}: +{lib, stdenv, fetchurl, gtk3, aspell, pkg-config, enchant, isocodes, intltool, gobject-introspection, vala}: stdenv.mkDerivation rec { pname = "gtkspell"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "--enable-vala" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gtkspell.sourceforge.net/"; description = "Word-processor-style highlighting GtkTextView widget"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index a1305a435b2..78d9956d30a 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, aspell, pkg-config, enchant, intltool}: +{lib, stdenv, fetchurl, gtk2, aspell, pkg-config, enchant, intltool}: stdenv.mkDerivation { name = "gtkspell-2.0.16"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [aspell gtk2 enchant intltool]; - meta = with stdenv.lib; { + meta = with lib; { description = "Word-processor-style highlighting and replacement of misspelled words"; homepage = "http://gtkspell.sourceforge.net"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix index 47edb03985d..31380b5ab79 100644 --- a/pkgs/development/libraries/gtkspellmm/default.nix +++ b/pkgs/development/libraries/gtkspellmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pkg-config , gtk3, glib, glibmm, gtkmm3, gtkspell3 }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { gtk3 glib glibmm gtkmm3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ binding for the gtkspell library"; homepage = "http://gtkspell.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 3738baa21ae..3204811ec6b 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkg-config, autoreconfHook, gettext, glib, buildPackages }: +{ fetchurl, lib, stdenv, pkg-config, autoreconfHook, gettext, glib, buildPackages }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "permission denied" - preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preBuild = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' pushd src make CC=${buildPackages.stdenv.cc}/bin/cc predicates_init mv predicates_init predicates_init_build @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gts.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; description = "GNU Triangulated Surface Library"; longDescription = '' @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { 3D surfaces meshed with interconnected triangles. ''; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = [ lib.maintainers.viric ]; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix index e8035d8b1cf..91053828b58 100644 --- a/pkgs/development/libraries/gumbo/default.nix +++ b/pkgs/development/libraries/gumbo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "gumbo"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "C99 HTML parsing algorithm"; homepage = "https://github.com/google/gumbo-parser"; maintainers = [ maintainers.nico202 ]; diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index d288f09b36a..9bf39d94aed 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , gobject-introspection @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1p3grslwqm9bc8rmpn4l48d7v9s84nina4r9xbd932dbj8acz7b8"; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://gupnp.org/"; description = "A collection of helpers for building AV (audio/video) applications using GUPnP"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index 6b5f80a0e51..e11d86f82e1 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , gobject-introspection @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0spzd2saax7w776p5laixdam6d7smyynr9qszhbmq7f14y13cghj"; }; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GUPnP/"; description = "Library to ease DLNA-related bits for applications using GUPnP"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index d5aa7a99196..2dad33949f3 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , autoreconfHook @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb"; }; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to handle UPnP IGD port mapping"; homepage = "http://www.gupnp.org/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 7f606c10b6b..fe3463eeff2 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , meson @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0911lv1bivsyv9wwdxm0i1w4r89j0vyyqp200gsfdnzk6v1a4x7x"; }; @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.gupnp.org/"; description = "An implementation of the UPnP specification"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 1d0c5e1b027..c3ae6faecfd 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, gobject-introspection +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gobject-introspection , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3 , glib, systemd, libusb1, vala, hwdata }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = false; # tests try to access USB - meta = with stdenv.lib; { + meta = with lib; { description = "GLib libusb wrapper"; homepage = "https://github.com/hughsie/libgusb"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 1b840eba73a..c30d678e02d 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { version = "1.46.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "00r56kp8dhdn1ypyap66klymlwlh646n4f1ri797w2x6p70sc7k2"; }; @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { openssh gsettings-desktop-schemas # TODO: a ligther version of libsoup to have FTP/HTTP support? - ] ++ stdenv.lib.optionals gnomeSupport [ + ] ++ lib.optionals gnomeSupport [ gnome3.libsoup gcr glib-networking # TLS support @@ -102,13 +102,13 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" "-Dtmpfilesdir=no" - ] ++ stdenv.lib.optionals (!gnomeSupport) [ + ] ++ lib.optionals (!gnomeSupport) [ "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false" "-Dgoogle=false" - ] ++ stdenv.lib.optionals (samba == null) [ + ] ++ lib.optionals (samba == null) [ # Xfce don't want samba "-Dsmb=false" ]; @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)"; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/development/libraries/half/default.nix index b0f4c3a0e9e..5232dfa5123 100644 --- a/pkgs/development/libraries/half/default.nix +++ b/pkgs/development/libraries/half/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { version = "2.1.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp $src/{ChangeLog,LICENSE,README}.txt $out/share/doc/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library for half precision floating point arithmetics"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 2c415b39df3..98b49461005 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkg-config, +{lib, stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkg-config, boost, libtool, perlPackages }: stdenv.mkDerivation rec { @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { which lets one control a radio transceiver or receiver, either from command line interface or in a text-oriented interactive interface. ''; - license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; + license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; homepage = "http://hamlib.sourceforge.net"; - maintainers = with stdenv.lib.maintainers; [ relrod ]; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ relrod ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index c0e1be30253..b3615893b53 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, glib, freetype, cairo, libintl +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, freetype, cairo, libintl , meson, ninja , gobject-introspection , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. @@ -12,7 +12,7 @@ let version = "2.7.2"; - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; in @@ -30,7 +30,7 @@ stdenv.mkDerivation { postPatch = '' patchShebangs src/*.py patchShebangs test - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # ApplicationServices.framework headers have cast-align warnings. substituteInPlace src/hb.hh \ --replace '#pragma GCC diagnostic error "-Wcast-align"' "" @@ -58,7 +58,7 @@ stdenv.mkDerivation { ]; buildInputs = [ glib freetype cairo ] # recommended by upstream - ++ stdenv.lib.optionals withCoreText [ ApplicationServices CoreText ]; + ++ lib.optionals withCoreText [ ApplicationServices CoreText ]; propagatedBuildInputs = [] ++ optional withGraphite2 graphite2 @@ -77,7 +77,7 @@ stdenv.mkDerivation { ''} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An OpenType text shaping engine"; homepage = "https://harfbuzz.github.io/"; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix index e9d5d5d9731..0525fcd0eba 100644 --- a/pkgs/development/libraries/hawknl/default.nix +++ b/pkgs/development/libraries/hawknl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { name = "hawknl-1.68"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = "http://hawksoft.com/hawknl/"; description = "Free, open source, game oriented network API"; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/hdf5-blosc/default.nix b/pkgs/development/libraries/hdf5-blosc/default.nix index ebce203125c..0879bb9ee9d 100644 --- a/pkgs/development/libraries/hdf5-blosc/default.nix +++ b/pkgs/development/libraries/hdf5-blosc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, c-blosc, cmake, hdf5, fetchFromGitHub }: +{ lib, stdenv, c-blosc, cmake, hdf5, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "hdf5-blosc"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { substituteAll ${./blosc_filter.pc.in} $out/lib/pkgconfig/blosc_filter.pc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Filter for HDF5 that uses the Blosc compressor"; homepage = "https://github.com/Blosc/hdf5-blosc"; license = licenses.mit; diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 2251bb7a91a..6a3665809b4 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, udev, libusb1 +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, udev, libusb1 , darwin }: stdenv.mkDerivation rec { @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ]; + ++ lib.optionals stdenv.isLinux [ libusb1 udev ]; enableParallelBuilding = true; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]); + propagatedBuildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]); - meta = with stdenv.lib; { + meta = with lib; { description = "Library for communicating with USB and Bluetooth HID devices"; homepage = "https://github.com/libusb/hidapi"; maintainers = with maintainers; [ prusnak ]; diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/development/libraries/highfive/default.nix index c514a44f851..a9db80468ee 100644 --- a/pkgs/development/libraries/highfive/default.nix +++ b/pkgs/development/libraries/highfive/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , boost @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { "-DHIGHFIVE_UNIT_TESTS=OFF" "-DHIGHFIVE_USE_INSTALL_DEPS=ON" ] - ++ (stdenv.lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]); + ++ (lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]); - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Header-only C++ HDF5 interface"; license = licenses.boost; diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index 2f7fe184845..d4998b51592 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "hiredis"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { PREFIX = "\${out}"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/redis/hiredis"; description = "Minimalistic C client for Redis >= 1.2"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 1afbe8a2f75..fb77e08ca6b 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper , perlPackages, libxml2, libiconv }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { autoreconfHook makeWrapper libxml2 ] ++ (with perlPackages; [ perl IOStringy ]) - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.isDarwin [ libiconv ]; postInstall = '' wrapProgram $out/bin/hivexregedit \ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --prefix "PATH" : "$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Windows registry hive extraction library"; license = licenses.lgpl2; homepage = "https://github.com/libguestfs/hivex"; diff --git a/pkgs/development/libraries/hotpatch/default.nix b/pkgs/development/libraries/hotpatch/default.nix index f8211b89d77..9857f9f281c 100644 --- a/pkgs/development/libraries/hotpatch/default.nix +++ b/pkgs/development/libraries/hotpatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "hotpatch-0.2"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH=$(pwd)/src make test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Hot patching executables on Linux using .so file injection"; homepage = src.meta.homepage; license = licenses.bsd3; diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix index df6e4329388..2611203a389 100644 --- a/pkgs/development/libraries/howard-hinnant-date/default.nix +++ b/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, curl, tzdata, fetchpatch, substituteAll }: +{ lib, stdenv, fetchFromGitHub, cmake, curl, tzdata, fetchpatch, substituteAll }: stdenv.mkDerivation rec { pname = "howard-hinnant-date-unstable"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; description = "A date and time library based on the C++11/14/17 header"; homepage = "https://github.com/HowardHinnant/date"; diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index f83d0aff32e..329fa99fa1c 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python }: +{ lib, stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python }: stdenv.mkDerivation rec { pname = "hpx"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "C++ standard library for concurrency and parallelism"; homepage = "https://github.com/STEllAR-GROUP/hpx"; - license = stdenv.lib.licenses.boost; - platforms = [ "x86_64-linux" ]; # stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bobakker ]; + license = lib.licenses.boost; + platforms = [ "x86_64-linux" ]; # lib.platforms.linux; + maintainers = with lib.maintainers; [ bobakker ]; }; } diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index 8501bf88b6d..137ccfeaf84 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, zlib }: +{ lib, stdenv, fetchurl, perl, zlib }: stdenv.mkDerivation rec { name = "${passthru.pname}-${passthru.version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patchPhase = ''patchShebangs .''; buildInputs = [ perl zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Hebrew spell checker"; homepage = "http://hspell.ivrix.org.il/"; platforms = platforms.all; diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix index ed3171da90f..286834112f2 100644 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "htmlcxx"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./ptrdiff.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://htmlcxx.sourceforge.net/"; description = "A simple non-validating css1 and html parser for C++"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 203fcaa19ec..9d1d23ede8b 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: let version = "2.9.4"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "An HTTP message parser written in C"; homepage = "https://github.com/nodejs/http-parser"; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 20acc49bb83..fe4fc1e6d33 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ncurses, readline, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { version = "1.7.0"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://hunspell.sourceforge.net"; description = "Spell checker"; longDescription = '' @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; license = with licenses; [ gpl2 lgpl21 mpl11 ]; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 2cdc30109d9..00d0933bdd7 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -1,6 +1,6 @@ /* hunspell dictionaries */ -{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }: +{ lib, stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }: let @@ -37,7 +37,7 @@ let rev = "v${version}"; sha256 = "0n9ms092k7vg7xpd3ksadxydbrizkb7js7dfxr08nbnnb9fgy0i8"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Hunspell dictionary for ${shortDescription} from rla"; homepage = "https://github.com/sbosio/rla-es"; license = with licenses; [ gpl3 lgpl3 mpl11 ]; @@ -76,7 +76,7 @@ let url = "https://extensions.libreoffice.org/extensions/swedish-spelling-dictionary-den-stora-svenska-ordlistan/${version}/@@download/file/${_name}.oxt"; sha256 = "b982881cc75f5c4af1199535bd4735ee476bdc48edf63e3f05fb4f715654a7bc"; }; - meta = with stdenv.lib; { + meta = with lib; { longDescription = '' Svensk ordlista baserad på DSSO (den stora svenska ordlistan) och Göran Anderssons (goran@init.se) arbete med denna. Ordlistan hämtas från @@ -118,7 +118,7 @@ let url = "http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v${version}.zip"; sha256 = "0ca7084jm7zb1ikwzh1frvpb97jn27i7a5d48288h2qlfp068ik0"; }; - meta = with stdenv.lib; { + meta = with lib; { inherit longDescription; description = "Hunspell dictionary for ${shortDescription} from Dicollecte"; homepage = "https://www.dicollecte.org/home.php?prj=fr"; @@ -132,7 +132,7 @@ let unpackCmd = '' unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} ''; - postInstall = stdenv.lib.optionalString isDefault '' + postInstall = lib.optionalString isDefault '' for ext in aff dic; do ln -sv $out/share/hunspell/${dictFileName}.$ext $out/share/hunspell/fr_FR.$ext ln -sv $out/share/myspell/dicts/${dictFileName}.$ext $out/share/myspell/dicts/fr_FR.$ext @@ -148,7 +148,7 @@ let name = "hunspell-dict-${shortName}-wordlist-${version}"; srcReadmeFile = "README_" + srcFileName + ".txt"; readmeFile = "README_" + dictFileName + ".txt"; - meta = with stdenv.lib; { + meta = with lib; { description = "Hunspell dictionary for ${shortDescription} from Wordlist"; homepage = "http://wordlist.aspell.net/"; license = licenses.bsd3; @@ -175,7 +175,7 @@ let version = "2.4"; name = "hunspell-dict-${shortName}-linguistico-${version}"; readmeFile = dictFileName + "_README.txt"; - meta = with stdenv.lib; { + meta = with lib; { description = "Hunspell dictionary for ${shortDescription}"; homepage = "https://sourceforge.net/projects/linguistico/"; license = licenses.gpl3; @@ -217,7 +217,7 @@ let ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://xuxen.eus/"; description = shortDescription; longDescription = longDescription; @@ -254,7 +254,7 @@ let ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.j3e.de/ispell/igerman98/index_en.html"; description = shortDescription; license = with licenses; [ gpl2 gpl3 ]; @@ -283,7 +283,7 @@ let buildPhase = '' cp -a ${sourceRoot}/* . ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.documentfoundation.org/Development/Dictionaries"; description = "Hunspell dictionary for ${shortDescription} from LibreOffice"; license = license; @@ -651,7 +651,7 @@ in rec { shortName = "hu-hu"; dictFileName = "hu_HU"; shortDescription = "Hungarian (Hungary)"; - license = with stdenv.lib.licenses; [ mpl20 lgpl3 ]; + license = with lib.licenses; [ mpl20 lgpl3 ]; }; /* SWEDISH */ @@ -714,7 +714,7 @@ in rec { unzip $src ${dictFileName}/{${dictFileName}.dic,${dictFileName}.aff,${readmeFile}} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Hunspell dictionary for Ukrainian (Ukraine) from LibreOffice"; homepage = "https://extensions.libreoffice.org/extensions/ukrainian-spelling-dictionary-and-thesaurus/"; license = licenses.mpl20; @@ -730,7 +730,7 @@ in rec { shortName = "ru-ru"; dictFileName = "ru_RU"; shortDescription = "Russian (Russian)"; - license = with stdenv.lib.licenses; [ mpl20 lgpl3 ]; + license = with lib.licenses; [ mpl20 lgpl3 ]; }; /* CZECH */ @@ -741,7 +741,7 @@ in rec { dictFileName = "cs_CZ"; shortDescription = "Czech (Czechia)"; readmeFile = "README_cs.txt"; - license = with stdenv.lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ gpl2 ]; }; /* SLOVAK */ @@ -752,7 +752,7 @@ in rec { dictFileName = "sk_SK"; shortDescription = "Slovak (Slovakia)"; readmeFile = "README_sk.txt"; - license = with stdenv.lib.licenses; [ gpl2 lgpl21 mpl11 ]; + license = with lib.licenses; [ gpl2 lgpl21 mpl11 ]; }; /* DANISH */ @@ -776,10 +776,10 @@ in rec { unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} -d ${dictFileName} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Hunspell dictionary for Danish (Denmark) from Stavekontrolden"; homepage = "https://github.com/jeppebundsgaard/stavekontrolden"; - license = with stdenv.lib.licenses; [ gpl2Only lgpl21Only mpl11 ]; + license = with lib.licenses; [ gpl2Only lgpl21Only mpl11 ]; maintainers = with maintainers; [ louisdk1 ]; }; }; diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 3c8ffee1bde..6a939835cf5 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl +{ lib, stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl , x11Support ? false, libX11 ? null, cairo ? null }: assert x11Support -> libX11 != null && cairo != null; -with stdenv.lib; +with lib; let version = "2.4.0"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation { # Filter out `null' inputs. This allows users to `.override' the # derivation and set optional dependencies to `null'. - buildInputs = stdenv.lib.filter (x: x != null) + buildInputs = lib.filter (x: x != null) ([ expat ncurses ] ++ (optionals x11Support [ cairo libX11 ]) ++ (optionals stdenv.isLinux [ numactl ])); diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix index 073e9d16686..177f6fe7909 100644 --- a/pkgs/development/libraries/hyena/default.nix +++ b/pkgs/development/libraries/hyena/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, mono, gtk-sharp-2_0, monoDLLFixer }: +{ lib, stdenv, fetchurl, pkg-config, mono, gtk-sharp-2_0, monoDLLFixer }: stdenv.mkDerivation rec { pname = "hyena"; version = "0.5"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "eb7154a42b6529bb9746c39272719f3168d6363ed4bad305a916ed7d90bc8de9"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { inherit monoDLLFixer; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Attic/Hyena"; description = "A C# library which contains a hodge-podge of random stuff"; longDescription = '' diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/development/libraries/hyperscan/default.nix index 3ab52165b78..f160afb99b7 100644 --- a/pkgs/development/libraries/hyperscan/default.nix +++ b/pkgs/development/libraries/hyperscan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ragel, python3 +{ lib, stdenv, fetchFromGitHub, cmake, ragel, python3 , coreutils, gnused, util-linux , boost , withStatic ? false # build only shared libs by default, build static+shared if true @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { "-DFAT_RUNTIME=ON" "-DBUILD_AVX512=ON" ] - ++ stdenv.lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON" - ++ stdenv.lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON"; + ++ lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON" + ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON"; postPatch = '' sed -i '/examples/d' CMakeLists.txt @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { --replace "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "High-performance multiple regex matching library"; longDescription = '' Hyperscan is a high-performance multiple regex matching library. diff --git a/pkgs/development/libraries/hyphen/default.nix b/pkgs/development/libraries/hyphen/default.nix index 9251b2853f1..ed3980f7a90 100644 --- a/pkgs/development/libraries/hyphen/default.nix +++ b/pkgs/development/libraries/hyphen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, ... }: +{ lib, stdenv, fetchurl, perl, ... }: let version = "2.8.8"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { sha256 = "01ap9pr6zzzbp4ky0vy7i1983fwyqy27pl0ld55s30fdxka3ciih"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A text hyphenation library"; homepage = "https://sourceforge.net/projects/hunspell/files/Hyphen/"; platforms = platforms.all; diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index d8e9bd16ab8..47eea8ba1af 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -30,18 +30,18 @@ let # $(includedir) is different from $(prefix)/include due to multiple outputs sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in - '' + stdenv.lib.optionalString stdenv.isAarch32 '' + '' + lib.optionalString stdenv.isAarch32 '' # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux ''; configureFlags = [ "--disable-debug" ] - ++ stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) "--enable-rpath" - ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-cross-build=${nativeBuildRoot}"; + ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) "--enable-rpath" + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-cross-build=${nativeBuildRoot}"; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Unicode and globalization support library"; homepage = "http://site.icu-project.org/"; maintainers = with maintainers; [ raskin ]; @@ -57,10 +57,10 @@ let # FIXME: This fixes dylib references in the dylibs themselves, but # not in the programs in $out/bin. - nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; # remove dependency on bootstrap-tools in early stdenv build - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc '' + (let replacements = [ diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index 6889a9f573a..31fc4fd6ba3 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib}: +{lib, stdenv, fetchurl, zlib}: stdenv.mkDerivation { name = "id3lib-3.8.3"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { doCheck = false; # fails to compile - meta = with stdenv.lib; { + meta = with lib; { description = "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags"; homepage = "http://id3lib.sourceforge.net"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix index da7b9f1f271..472a23a2b74 100644 --- a/pkgs/development/libraries/idnkit/default.nix +++ b/pkgs/development/libraries/idnkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv }: +{ lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { pname = "idnkit"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nic.ad.jp/ja/idn/idnkit"; description = "Provides functionalities about i18n domain name processing"; license = "idnkit-2 license"; diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix index 46ed422b540..b300731ce44 100644 --- a/pkgs/development/libraries/ijs/default.nix +++ b/pkgs/development/libraries/ijs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, ghostscript }: +{ lib, stdenv, autoreconfHook, ghostscript }: stdenv.mkDerivation { name = "ijs-${ghostscript.version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { configureFlags = [ "--enable-shared" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.openprinting.org/download/ijs/"; description = "Raster printer driver architecture"; diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix index d9c01ab5fcf..6ba64dcaa58 100644 --- a/pkgs/development/libraries/iksemel/default.nix +++ b/pkgs/development/libraries/iksemel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, libtool, pkg-config, gnutls, fetchFromGitHub, texinfo }: +{ lib, stdenv, autoreconfHook, libtool, pkg-config, gnutls, fetchFromGitHub, texinfo }: stdenv.mkDerivation rec { pname = "iksemel"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook libtool texinfo ]; buildInputs = [ gnutls ]; - meta = with stdenv.lib; { + meta = with lib; { description = "XML parser for jabber"; homepage = "https://github.com/timothytylee/iksemel-1.4"; diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix index 37885c767bd..39d7b7b61b0 100644 --- a/pkgs/development/libraries/ilbc/default.nix +++ b/pkgs/development/libraries/ilbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gawk, cmake }: +{ lib, stdenv, fetchurl, gawk, cmake }: stdenv.mkDerivation rec { name = "ilbc-rfc3951"; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix index 26e63747523..b6f1c0ac78a 100644 --- a/pkgs/development/libraries/ilixi/default.nix +++ b/pkgs/development/libraries/ilixi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, directfb, libsigcxx, libxml2, fontconfig }: +{ lib, stdenv, fetchurl, pkg-config, directfb, libsigcxx, libxml2, fontconfig }: # TODO: optional deps: baresip, FusionDale, FusionSound, SaWMan, doxygen, # Reflex, Wnn, NLS @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--with-examples" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight C++ GUI toolkit for embedded Linux systems"; homepage = "https://github.com/ilixi/ilixi"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 68bd677cf77..219d961f9f9 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "ilmbase"; - version = stdenv.lib.getVersion openexr; + version = lib.getVersion openexr; # the project no longer provides separate tarballs. We may even want to merge # the ilmbase package into openexr in the future. @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cd IlmBase ''; - meta = with stdenv.lib; { + meta = with lib; { description = " A library for 2D/3D vectors and matrices and other mathematical objects, functions and data types for computer graphics"; homepage = "https://www.openexr.com/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix index cf1d9018fd5..c666a15b63b 100644 --- a/pkgs/development/libraries/iml/default.nix +++ b/pkgs/development/libraries/iml/default.nix @@ -1,4 +1,4 @@ -{stdenv, autoreconfHook, fetchurl, gmp, blas}: +{lib, stdenv, autoreconfHook, fetchurl, gmp, blas}: stdenv.mkDerivation rec { pname = "iml"; version = "1.0.5"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''Algorithms for computing exact solutions to dense systems of linear equations over the integers''; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "https://cs.uwaterloo.ca/~astorjoh/iml.html"; updateWalker = true; }; diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index b94af22c0a7..53612f8205f 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}: +{lib, stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}: stdenv.mkDerivation { name = "imlib-1.9.15"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [libjpeg libXext libX11 xorgproto libtiff libungif libpng]; - meta = with stdenv.lib; { + meta = with lib; { description = "An image loading and rendering library for X11"; platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index aabfff908c1..666fcab989b 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl # Image file formats , libjpeg, libtiff, giflib, libpng, libwebp # imlib2 can load images from ID3 tags. @@ -8,7 +8,7 @@ }: let - inherit (stdenv.lib) optional; + inherit (lib) optional; in stdenv.mkDerivation rec { pname = "imlib2"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { moveToOutput bin/imlib2-config "$dev" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Image manipulation library"; longDescription = '' diff --git a/pkgs/development/libraries/impy/default.nix b/pkgs/development/libraries/impy/default.nix index c865b25c000..1f5d9070dd3 100644 --- a/pkgs/development/libraries/impy/default.nix +++ b/pkgs/development/libraries/impy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { SDL2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple library for loading/saving images and animations, written in C"; homepage = "https://github.com/bcampbell/impy"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/inchi/default.nix b/pkgs/development/libraries/inchi/default.nix index 86901100759..6acdf340c91 100644 --- a/pkgs/development/libraries/inchi/default.nix +++ b/pkgs/development/libraries/inchi/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchurl, stdenv, unzip }: +{ pkgs, fetchurl, lib, stdenv, unzip }: stdenv.mkDerivation { pname = "inchi"; version = "1.05"; @@ -41,7 +41,7 @@ stdenv.mkDerivation { install -m 644 INCHI-1-DOC/*.pdf $doc/share ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.inchi-trust.org/"; description = "IUPAC International Chemical Identifier library"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index c08d5924b0c..67ae5623db1 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, tcl }: +{ lib, stdenv, fetchurl, writeText, tcl }: stdenv.mkDerivation rec { pname = "incrtcl"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { rmdir $out/bin mv $out/lib/itcl${version}/* $out/lib ln -s libitcl${version}${stdenv.hostPlatform.extensions.sharedLibrary} \ - $out/lib/libitcl${stdenv.lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} + $out/lib/libitcl${lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} rmdir $out/lib/itcl${version} ''; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://incrtcl.sourceforge.net/"; description = "Object Oriented Enhancements for Tcl/Tk"; license = licenses.tcltk; diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index 5588a157c46..8947e33e900 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchbzr +{ lib, stdenv, fetchbzr , pkg-config, systemd, autoreconfHook , glib, dbus-glib, json-glib , gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { rm -rf $out/share/upstart ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Indicator to take menus from applications and place them in the panel"; homepage = "https://launchpad.net/indicator-application"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index 1663542521c..035356ac861 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , cfitsio @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { fftw ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.indilib.org/"; description = "Implementation of the INDI protocol for POSIX operating systems"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/inih/default.nix b/pkgs/development/libraries/inih/default.nix index 62de607f7d4..11e49f7ddc4 100644 --- a/pkgs/development/libraries/inih/default.nix +++ b/pkgs/development/libraries/inih/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { pname = "inih"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "-Dwith_INIReader=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple .INI file parser in C, good for embedded systems"; homepage = "https://github.com/benhoyt/inih"; changelog = "https://github.com/benhoyt/inih/releases/tag/${version}"; diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 51c6728e8b0..8c7fdfd04d6 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "iniparser"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = ./no-usr.patch; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile \ --replace -Wl,-soname= -Wl,-install_name, ''; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ln -s libiniparser.so.1 $out/lib/libiniparser.so ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Free standalone ini file parsing library"; license = licenses.mit; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 30d572853cf..f050a9c7b3b 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/intel/gmmlib"; license = licenses.mit; description = "Intel Graphics Memory Management Library"; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 6f2f543af06..75175bde4b3 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, pkg-config , libva, libpciaccess, intel-gmmlib , enableX11 ? true, libX11 @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libva libpciaccess intel-gmmlib ] - ++ stdenv.lib.optional enableX11 libX11; + ++ lib.optional enableX11 libX11; - meta = with stdenv.lib; { + meta = with lib; { description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs"; longDescription = '' The Intel Media Driver for VAAPI is a new VA-API (Video Acceleration API) @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ primeos jfrankenau ]; }; - postFixup = stdenv.lib.optionalString enableX11 '' - patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${stdenv.lib.makeLibraryPath [ libX11 ]}" \ + postFixup = lib.optionalString enableX11 '' + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${lib.makeLibraryPath [ libX11 ]}" \ $out/lib/dri/iHD_drv_video.so ''; } diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 1fe45a49258..dd605aaae5c 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, gtest, libdrm, libpciaccess, libva, libX11 +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtest, libdrm, libpciaccess, libva, libX11 , libXau, libXdmcp, libpthreadstubs }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Intel Media SDK"; license = licenses.mit; maintainers = with maintainers; [ midchildan ]; diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix index 8387aa67161..23801d3436d 100644 --- a/pkgs/development/libraries/ip2location-c/default.nix +++ b/pkgs/development/libraries/ip2location-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "ip2location-c"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # databases are available, downloading them for just 1 test seems excessive): doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to look up locations of host names and IP addresses"; longDescription = '' A C library to find the country, region, city,coordinates, diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 84e7fae6045..5214fa9e149 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }: +{ lib, stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }: let common = import ./common.nix { inherit fetchzip; }; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://irrlicht.sourceforge.net/"; - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index 6a33b0feadb..b41486ce9dd 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: +{ lib, stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: let common = import ./common.nix { inherit fetchzip; }; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://irrlicht.sourceforge.net/"; - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix index 1cac0d369fe..5beffd1f0d2 100644 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ b/pkgs/development/libraries/isl/0.11.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp }: +{ lib, stdenv, fetchurl, gmp }: stdenv.mkDerivation { name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08. @@ -15,8 +15,8 @@ stdenv.mkDerivation { meta = { homepage = "https://www.kotnet.org/~skimo/isl/"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix index a97e05b0431..8936d6c5f3b 100644 --- a/pkgs/development/libraries/isl/0.14.1.nix +++ b/pkgs/development/libraries/isl/0.14.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp }: +{ lib, stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { name = "isl-0.14.1"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.kotnet.org/~skimo/isl/"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/isl/0.17.1.nix b/pkgs/development/libraries/isl/0.17.1.nix index 018f7085088..a823b69fa27 100644 --- a/pkgs/development/libraries/isl/0.17.1.nix +++ b/pkgs/development/libraries/isl/0.17.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp }: +{ lib, stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { name = "isl-0.17.1"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.kotnet.org/~skimo/isl/"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/isl/0.20.0.nix b/pkgs/development/libraries/isl/0.20.0.nix index 3775bdc71e0..c35588555a7 100644 --- a/pkgs/development/libraries/isl/0.20.0.nix +++ b/pkgs/development/libraries/isl/0.20.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp }: +{ lib, stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { name = "isl-0.20"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://isl.gforge.inria.fr/"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 8ba9ea31b80..6d770430ce5 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gettext, python3}: +{lib, stdenv, fetchurl, gettext, python3}: stdenv.mkDerivation rec { pname = "iso-codes"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext python3 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://salsa.debian.org/iso-codes-team/iso-codes"; description = "Various ISO codes packaged as XML files"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/itk/4.x.nix b/pkgs/development/libraries/itk/4.x.nix index 7a7176c88c1..54a3c33cd01 100644 --- a/pkgs/development/libraries/itk/4.x.nix +++ b/pkgs/development/libraries/itk/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk_7, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk_7, Cocoa }: stdenv.mkDerivation rec { pname = "itk"; @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake xz ]; - buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ libX11 libuuid vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; meta = { description = "Insight Segmentation and Registration Toolkit"; homepage = "https://www.itk.org/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 59a883e1f96..ac899ce26f1 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper , pkg-config, libX11, libuuid, xz, vtk_7, Cocoa }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake xz makeWrapper ]; - buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ libX11 libuuid vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; postInstall = '' wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "Insight Segmentation and Registration Toolkit"; homepage = "https://www.itk.org/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [viric]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [viric]; }; } diff --git a/pkgs/development/libraries/itktcl/default.nix b/pkgs/development/libraries/itktcl/default.nix index 3c70369eb91..570190a43c1 100644 --- a/pkgs/development/libraries/itktcl/default.nix +++ b/pkgs/development/libraries/itktcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tk, incrtcl }: +{ lib, stdenv, fetchurl, tcl, tk, incrtcl }: stdenv.mkDerivation rec { pname = "itk-tcl"; @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { rmdir $out/bin mv $out/lib/itk${version}/* $out/lib ln -s libitk${version}${stdenv.hostPlatform.extensions.sharedLibrary} \ - $out/lib/libitk${stdenv.lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} + $out/lib/libitk${lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} rmdir $out/lib/itk${version} ''; outputs = [ "out" "dev" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://incrtcl.sourceforge.net/"; description = "Mega-widget toolkit for incr Tk"; license = licenses.tcltk; diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix index 5c7473be647..02dd4a5635b 100644 --- a/pkgs/development/libraries/jama/default.nix +++ b/pkgs/development/libraries/jama/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, tnt}: +{lib, stdenv, fetchurl, unzip, tnt}: stdenv.mkDerivation rec { pname = "jama"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp *.h $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://math.nist.gov/tnt/"; description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 7ecf7579a30..85451511d7e 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "jansson-2.13.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ks7gbs0j8p4dmmi2sq129mxy5gfg0z6220i1jk020mi2zd7gwzl"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.digip.org/jansson/"; description = "C library for encoding, decoding and manipulating JSON data"; license = licenses.mit; diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix index 4a2b030a3db..9d34aaf6c8e 100644 --- a/pkgs/development/libraries/java/commons/bcel/default.nix +++ b/pkgs/development/libraries/java/commons/bcel/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { version = "5.2"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://commons.apache.org/proper/commons-bcel/"; description = "Gives users a convenient way to analyze, create, and manipulate (binary) Java class files"; - maintainers = with stdenv.lib.maintainers; [ copumpkin ]; - license = stdenv.lib.licenses.asl20; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ copumpkin ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/commons/bsf/default.nix b/pkgs/development/libraries/java/commons/bsf/default.nix index 46bd3c0fd15..629ab7ec131 100644 --- a/pkgs/development/libraries/java/commons/bsf/default.nix +++ b/pkgs/development/libraries/java/commons/bsf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "commons-bsf-1.2"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { description = "Interface to scripting languages, including JSR-223"; homepage = "http://commons.apache.org/proper/commons-bsf/"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index 5307c635834..79f63026e38 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "1.20"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://commons.apache.org/proper/commons-compress"; description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files"; - maintainers = with stdenv.lib.maintainers; [ copumpkin ]; - license = stdenv.lib.licenses.asl20; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ copumpkin ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix index cd439b50397..868f2da4e53 100644 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { version = "1.3.1"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://commons.apache.org/proper/commons-fileupload"; description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications"; - maintainers = with stdenv.lib.maintainers; [ copumpkin ]; - license = stdenv.lib.licenses.asl20; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ copumpkin ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix index 10587a72ecd..0c5ac8f4dde 100644 --- a/pkgs/development/libraries/java/commons/io/default.nix +++ b/pkgs/development/libraries/java/commons/io/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "2.8.0"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://commons.apache.org/proper/commons-io"; description = "A library of utilities to assist with developing IO functionality"; - maintainers = with stdenv.lib.maintainers; [ copumpkin ]; - license = stdenv.lib.licenses.asl20; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ copumpkin ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix index bd0f7c273e7..5009fe6cac7 100644 --- a/pkgs/development/libraries/java/commons/lang/default.nix +++ b/pkgs/development/libraries/java/commons/lang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "3.11"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://commons.apache.org/proper/commons-lang"; description = "Provides additional methods to manipulate standard Java library classes"; - maintainers = with stdenv.lib.maintainers; [ copumpkin ]; - license = stdenv.lib.licenses.asl20; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ copumpkin ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/commons/logging/default.nix b/pkgs/development/libraries/java/commons/logging/default.nix index 7c2192e4952..d63a214e2ad 100644 --- a/pkgs/development/libraries/java/commons/logging/default.nix +++ b/pkgs/development/libraries/java/commons/logging/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "commons-logging-1.2"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { description = "Wrapper around a variety of logging API implementations"; homepage = "http://commons.apache.org/proper/commons-logging"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix index 7c4fc5c632e..960f12fb8bf 100644 --- a/pkgs/development/libraries/java/commons/math/default.nix +++ b/pkgs/development/libraries/java/commons/math/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "3.6.1"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://commons.apache.org/proper/commons-math/"; description = "A library of lightweight, self-contained mathematics and statistics components"; - maintainers = with stdenv.lib.maintainers; [ copumpkin ]; - license = stdenv.lib.licenses.asl20; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ copumpkin ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix index acf8cc9b83d..f7732ff637a 100644 --- a/pkgs/development/libraries/java/cup/default.nix +++ b/pkgs/development/libraries/java/cup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk, ant } : +{ lib, stdenv, fetchurl, jdk, ant } : stdenv.mkDerivation rec { pname = "java-cup"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www2.cs.tum.edu/projects/cup/"; description = "LALR parser generator for Java"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index 0133138b478..505d60e2c8d 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gettext, jdk8, libmatthew_java}: +{lib, stdenv, fetchurl, gettext, jdk8, libmatthew_java}: let jdk = jdk8; in stdenv.mkDerivation { @@ -19,7 +19,7 @@ stdenv.mkDerivation { -e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; maintainers = [ maintainers.sander ]; license = licenses.afl21; diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index fd4bfb29706..4d9902cbbe9 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jdk, unzip}: +{lib, stdenv, fetchurl, jdk, unzip}: stdenv.mkDerivation { name = "GeoIPJava-1.2.5"; @@ -20,8 +20,8 @@ stdenv.mkDerivation { ''; meta = { description = "GeoIP Java API"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/pkgs/development/libraries/java/gwt-dragdrop/default.nix index 37d7cac0da2..34a0e8c530a 100644 --- a/pkgs/development/libraries/java/gwt-dragdrop/default.nix +++ b/pkgs/development/libraries/java/gwt-dragdrop/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "gwt-dnd-2.6.5"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw"; }; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/development/libraries/java/gwt-widgets/default.nix b/pkgs/development/libraries/java/gwt-widgets/default.nix index a968ebc5fd8..692326a2189 100644 --- a/pkgs/development/libraries/java/gwt-widgets/default.nix +++ b/pkgs/development/libraries/java/gwt-widgets/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "gwt-widgets-0.2.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb"; }; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.unix; license = with licenses; [ afl21 lgpl2 ]; }; diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index 88f32866b0d..433cf75ad5a 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, unzip, makeWrapper, jre }: +{ lib, stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { pname = "hsqldb"; version = "2.5.1"; - underscoreMajMin = stdenv.lib.strings.replaceChars ["."] ["_"] (stdenv.lib.versions.majorMinor version); + underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (stdenv.lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://hsqldb.org"; description = "A relational, embedable database management system written in Java and a set of related tools"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix index 34af97605d2..ad276fcdd63 100644 --- a/pkgs/development/libraries/java/httpunit/default.nix +++ b/pkgs/development/libraries/java/httpunit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip} : +{lib, stdenv, fetchurl, unzip} : stdenv.mkDerivation { name = "httpunit-1.7"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { inherit unzip; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://httpunit.sourceforge.net"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 54e85ec5589..19bc3524c59 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, stdenv, ant, jdk }: +{ fetchgit, lib, stdenv, ant, jdk }: stdenv.mkDerivation { pname = "hydra-ant-logger"; @@ -20,6 +20,6 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix index 60558f72cfc..4bb90dd9887 100644 --- a/pkgs/development/libraries/java/jdom/default.nix +++ b/pkgs/development/libraries/java/jdom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl} : +{lib, stdenv, fetchurl} : stdenv.mkDerivation { name = "jdom-1.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Java-based solution for accessing, manipulating, and outputting XML data from Java code"; homepage = "http://www.jdom.org"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix index d0258d5896b..cf5b42a0ac2 100644 --- a/pkgs/development/libraries/java/jflex/default.nix +++ b/pkgs/development/libraries/java/jflex/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jre} : +{lib, stdenv, fetchurl, jre} : stdenv.mkDerivation rec { name = "jflex-1.8.2"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.jflex.de/"; description = "Lexical analyzer generator for Java, written in Java"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix index c114ddeac27..1695d11cb25 100644 --- a/pkgs/development/libraries/java/junit/default.nix +++ b/pkgs/development/libraries/java/junit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, antBuild, fetchgit, perl }: +{ lib, stdenv, antBuild, fetchgit, perl }: let version = "4.11"; @@ -22,7 +22,7 @@ in antBuild { meta = { homepage = "http://www.junit.org/"; description = "A framework for repeatable tests in Java"; - license = stdenv.lib.licenses.epl10; + license = lib.licenses.epl10; broken = true; }; } diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix index cb88df276a5..b9b00223186 100644 --- a/pkgs/development/libraries/java/junixsocket/default.nix +++ b/pkgs/development/libraries/java/junixsocket/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ant, jdk, junit }: +{ lib, stdenv, fetchurl, ant, jdk, junit }: stdenv.mkDerivation rec { name = "junixsocket-1.3"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib. (if stdenv.is64bit then [ "-Dskip32=true" ] else [ "-Dskip64=true" ]) ++ [ "-Dgcc=cc" "-Dant.build.javac.source=1.6" ] - ++ stdenv.lib.optional stdenv.isDarwin "-DisMac=true"; + ++ lib.optional stdenv.isDarwin "-DisMac=true"; installPhase = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "A Java/JNI library for using Unix Domain Sockets from Java"; homepage = "https://github.com/kohlschutter/junixsocket"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.asl20; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index 8b8123dff2b..b0173cbdb84 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jdk}: +{lib, stdenv, fetchurl, jdk}: stdenv.mkDerivation { name = "libmatthew-java-0.8"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { PREFIX=''''${out}''; buildInputs = [ jdk ]; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; maintainers = [ maintainers.sander ]; license = licenses.mit; diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index 6d09bead53e..ddf95ead249 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jdk }: +{ lib, stdenv, fetchurl, makeWrapper, jdk }: stdenv.mkDerivation rec { name = "lombok-1.18.16"; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { meta = { description = "A library that can write a lot of boilerplate for your Java project"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.mit; + platforms = lib.platforms.all; + license = lib.licenses.mit; homepage = "https://projectlombok.org/"; - maintainers = [ stdenv.lib.maintainers.CrystalGamma ]; + maintainers = [ lib.maintainers.CrystalGamma ]; }; } diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix index c0eabe51657..417c7b96900 100644 --- a/pkgs/development/libraries/java/lucene/default.nix +++ b/pkgs/development/libraries/java/lucene/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl} : +{lib, stdenv, fetchurl} : stdenv.mkDerivation rec { pname = "lucene"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Java full-text search engine"; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix index 817c861436f..e20d7e707e7 100644 --- a/pkgs/development/libraries/java/mockobjects/default.nix +++ b/pkgs/development/libraries/java/mockobjects/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl} : +{lib, stdenv, fetchurl} : stdenv.mkDerivation { name = "mockobjects-0.09"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Generic unit testing framework and methodology for testing any kind of code"; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index d3d10f61b70..d34787d8b1f 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unzip, ant, javac, jvm }: +{ fetchurl, lib, stdenv, unzip, ant, javac, jvm }: let version = "1.7R2"; @@ -43,7 +43,7 @@ stdenv.mkDerivation { cp -v *.jar "$out/share/java" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of JavaScript written in Java"; longDescription = diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index ef403be60df..e6f2fcadbe7 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, unzip, jre }: +{ lib, stdenv, fetchurl, unzip, jre }: let common = { pname, version, src, description - , prog ? null, jar ? null, license ? stdenv.lib.licenses.mpl20 }: + , prog ? null, jar ? null, license ? lib.licenses.mpl20 }: stdenv.mkDerivation { name = "${pname}-${version}"; inherit pname version src; @@ -26,7 +26,7 @@ let chmod a+x $out/bin/${prog'} ''; - meta = with stdenv.lib; { + meta = with lib; { inherit description license; homepage = "http://saxon.sourceforge.net/"; maintainers = with maintainers; [ rvl ]; @@ -44,7 +44,7 @@ in { }; description = "XSLT 1.0 processor"; # http://saxon.sourceforge.net/saxon6.5.3/conditions.html - license = stdenv.lib.licenses.mpl10; + license = lib.licenses.mpl10; }; saxonb_8_8 = common { diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index c1d41e7743d..f831bfc8b93 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "smack-4.1.9"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "A XMPP (Jabber) client library for instant messaging and presence"; homepage = "http://www.igniterealtime.org/projects/smack/"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.asl20; + platforms = lib.platforms.unix; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 4cbdca9932f..bf35490f9a8 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { cd out && jar -c * > $out/jars/swt.jar ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.eclipse.org/swt/"; description = "An widget toolkit for Java to access the user-interface facilities of the operating systems on which it is implemented"; license = licenses.epl10; diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index 4004c9f387e..6f9d88d6366 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, autoreconfHook }: +{ lib, stdenv, fetchurl, python3, autoreconfHook }: stdenv.mkDerivation rec { pname = "jbig2dec"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.jbig2dec.com/"; description = "Decoder implementation of the JBIG2 image compression format"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index c21d51bc5a7..ab55e76f29a 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "jbigkit-2.1"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - "AR=${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" - "RANLIB=${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" + "AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" + "RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" ]; postPatch = '' @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; description = "A software implementation of the JBIG1 data compression standard"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/jcal/default.nix b/pkgs/development/libraries/jcal/default.nix index a40de74037a..2b57bd4064b 100644 --- a/pkgs/development/libraries/jcal/default.nix +++ b/pkgs/development/libraries/jcal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , readline }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preAutoreconf = "cd sources/"; - meta = with stdenv.lib; { + meta = with lib; { description = "Jalali calendar is a small and portable free software library to manipulate date and time in Jalali calendar system"; homepage = "http://nongnu.org/jcal/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index fc4f0f2fe6e..d5fe07b00f2 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -1,5 +1,5 @@ { version, sha256 }: -{ stdenv, fetchurl +{ lib, stdenv, fetchurl # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which # then stops downstream builds (mariadb in particular) from detecting it. This # option should remove the prefix and give us a working jemalloc. @@ -9,7 +9,7 @@ , disableInitExecTls ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "jemalloc"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://jemalloc.net"; description = "General purpose malloc(3) implementation"; longDescription = '' diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix index 4cafa7434b1..11f6141872d 100644 --- a/pkgs/development/libraries/jitterentropy/default.nix +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "jitterentropy"; version = "2.2.0"; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { description = "Provides a noise source using the CPU execution timing jitter"; homepage = "https://github.com/smuellerDD/jitterentropy-library"; - license = with stdenv.lib.licenses; [ gpl2 bsd3 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ johnazoidberg ]; + license = with lib.licenses; [ gpl2 bsd3 ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ johnazoidberg ]; }; } diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index d72d5021434..5a77ea789af 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "json-c"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A JSON implementation in C"; homepage = "https://github.com/json-c/json-c/wiki"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 07e6d679aa7..a820d947b7f 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, meson, ninja, pkg-config, gettext +{ lib, stdenv, fetchurl, glib, meson, ninja, pkg-config, gettext , gobject-introspection, fixDarwinDylibNames, gnome3 }: @@ -9,13 +9,13 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j"; }; propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; outputs = [ "out" "dev" ]; @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; homepage = "https://wiki.gnome.org/Projects/JsonGlib"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 73aaaec4e4c..71b0d7b9a92 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python, validatePkgConfig, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, cmake, python, validatePkgConfig, fetchpatch }: stdenv.mkDerivation rec { pname = "jsoncpp"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit version; homepage = "https://github.com/open-source-parsers/jsoncpp"; description = "A C++ library for interacting with JSON"; diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index da84578d780..1ec9c3da41e 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; version = "3.38.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib json-glib ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "3F8ZFKkRUrcPqPyaEe3hMUirSvZE2yejZjI4jJJ6ioI="; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to communicate using the JSON-RPC 2.0 specification"; homepage = "https://gitlab.gnome.org/GNOME/jsonrpc-glib"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index ad422db3d48..037225b86e5 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "judy-1.0.5"; @@ -10,14 +10,14 @@ stdenv.mkDerivation { # gcc 4.8 optimisations break judy. # https://sourceforge.net/p/judy/mailman/message/31995144/ - preConfigure = stdenv.lib.optionalString stdenv.cc.isGNU '' + preConfigure = lib.optionalString stdenv.cc.isGNU '' configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations") ''; meta = { homepage = "http://judy.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; description = "State-of-the-art C library that implements a sparse dynamic array"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix index f0f5b9d7793..78cc48d8209 100644 --- a/pkgs/development/libraries/jxrlib/default.nix +++ b/pkgs/development/libraries/jxrlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python }: +{ lib, stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { pname = "jxrlib"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0rk3hbh00nw0wgbfbqk1szrlfg3yq7w6ar16napww3nrlm9cj65w"; }; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile \ --replace '-shared' '-dynamiclib -undefined dynamic_lookup' \ --replace '.so' '.dylib' @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DIR_INSTALL=$(out)" "SHARED=1" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Implementation of the JPEG XR image codec standard"; homepage = "https://jxrlib.codeplex.com"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index e56dfd45834..804749bbdb5 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python2, perl, yacc, flex +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python2, perl, yacc, flex , texinfo, perlPackages , openldap, libcap_ng, sqlite, openssl, db, libedit, pam , CoreFoundation, Security, SystemConfiguration }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "heimdal"; version = "7.7.0"; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 022b6db1a24..5ef9e496b94 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, perl, yacc, bootstrap_cmds +{ lib, stdenv, fetchurl, pkg-config, perl, yacc, bootstrap_cmds , openssl, openldap, libedit, keyutils # Extra Arguments @@ -16,7 +16,7 @@ let libOnly = type == "lib"; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; majorVersion = "1.18"; # remove patches below with next upgrade diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 6b42cff7903..663abb15280 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome3 +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome3 , gtk-doc, gtk2, python2Packages, lua, gobject-introspection }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { ./autogen.sh --prefix="$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for registering global key bindings"; longDescription = '' keybinder is a library for registering global keyboard shortcuts. diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index dde4e80f070..e291ec56bb2 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome3 +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome3 , gtk-doc, gtk3, libX11, libXext, libXrender, gobject-introspection }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ./autogen.sh --prefix="$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for registering global key bindings"; homepage = "https://github.com/kupferlauncher/keybinder/"; license = licenses.mit; diff --git a/pkgs/development/libraries/keystone/default.nix b/pkgs/development/libraries/keystone/default.nix index 869d7ae1b02..70864bcf24a 100644 --- a/pkgs/development/libraries/keystone/default.nix +++ b/pkgs/development/libraries/keystone/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config , cmake @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { python3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight multi-platform, multi-architecture assembler framework"; homepage = "https://www.keystone-engine.org"; license = licenses.gpl2Only; diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index a42f1c0a513..f4688f34982 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }: +{ lib, stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }: stdenv.mkDerivation rec { name = "khronos-ocl-icd-loader-${version}"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy"; }; - patches = stdenv.lib.lists.optional withTracing ./tracing.patch; + patches = lib.lists.optional withTracing ./tracing.patch; nativeBuildInputs = [ cmake ]; buildInputs = [ opencl-headers ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Offical Khronos OpenCL ICD Loader"; homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader"; license = licenses.asl20; diff --git a/pkgs/development/libraries/kissfft/default.nix b/pkgs/development/libraries/kissfft/default.nix index 370f628ff7a..5395ac4ab9c 100644 --- a/pkgs/development/libraries/kissfft/default.nix +++ b/pkgs/development/libraries/kissfft/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "DATATYPE=double" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A mixed-radix Fast Fourier Transform based up on the KISS principle"; homepage = "https://github.com/mborgerding/kissfft"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index 02d216ca59c..65dce915f14 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, libdrm +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libdrm , withPython ? false, python }: stdenv.mkDerivation { @@ -13,12 +13,12 @@ stdenv.mkDerivation { sha256 = "0xz4m9bk0naawxwpx5cy1j3cm6c8c9m5y551csk88y88x1g0z0xh"; }; - cmakeFlags = stdenv.lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF"; + cmakeFlags = lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libdrm python ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; homepage = "https://github.com/tomba/kmsxx"; license = licenses.mpl20; diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index d2677f69f9f..837333407b2 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules ]; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with lib.maintainers; [ peterhoeg ]; # The build requires at least Qt 5.14: broken = lib.versionOlder qtbase.version "5.14"; diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 9c360ce0531..4e8aa57d956 100644 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { name = "kyotocabinet-1.2.76"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0g6js20x7vnpq4p8ghbw3mh9wpqksya9vwhzdx6dnlf354zjsal1"; }; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace kccommon.h \ --replace tr1/unordered_map unordered_map \ --replace tr1/unordered_set unordered_set \ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://fallabs.com/kyotocabinet"; description = "A library of routines for managing a database"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/l-smash/default.nix b/pkgs/development/libraries/l-smash/default.nix index 34dab6bb3ff..b1b5fd01206 100644 --- a/pkgs/development/libraries/l-smash/default.nix +++ b/pkgs/development/libraries/l-smash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which }: +{ lib, stdenv, fetchFromGitHub, which }: stdenv.mkDerivation rec { pname = "l-smash"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://l-smash.github.io/l-smash/"; description = "MP4 container utilities"; license = licenses.isc; diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index da3784100ab..8ed0962bece 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , nasmSupport ? true, nasm ? null # Assembly optimizations , cpmlSupport ? true # Compaq's fast math library #, efenceSupport ? false, libefence ? null # Use ElectricFence for malloc debugging @@ -20,7 +20,7 @@ let mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "lame"; version = "3.100"; diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index 913353a32fe..a44535fbf90 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive , libxml2, icu , languageMachines @@ -37,7 +37,7 @@ stdenv.mkDerivation { make check ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch"; homepage = "https://languagemachines.github.io/frog"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix index 3560ae8e460..7e890a8d09c 100644 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/pkgs/development/libraries/languagemachines/frogdata.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , automake, autoconf, libtool, pkg-config, autoconf-archive }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { sh bootstrap.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Data for Frog, a Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch"; homepage = "https://languagemachines.github.io/frog"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index 297967351d9..fc5e622bcf4 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , automake, autoconf, libtool, pkg-config, autoconf-archive , libxml2, icu, bzip2, libtar , languageMachines }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ API for FoLiA documents; an XML-based linguistic annotation format."; homepage = "https://proycon.github.io/folia/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix index 7fee1ea3a3f..efa9ada7d56 100644 --- a/pkgs/development/libraries/languagemachines/mbt.nix +++ b/pkgs/development/libraries/languagemachines/mbt.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive , libxml2 , languageMachines @@ -24,7 +24,7 @@ stdenv.mkDerivation { sh bootstrap.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Memory Based Tagger"; homepage = "https://languagemachines.github.io/mbt/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix index c3999d1c558..c09f00b1160 100644 --- a/pkgs/development/libraries/languagemachines/ticcutils.nix +++ b/pkgs/development/libraries/languagemachines/ticcutils.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , automake, autoconf, libtool, pkg-config, autoconf-archive , libxml2, zlib, bzip2, libtar }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { ]; preConfigure = "sh bootstrap.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "This module contains useful functions for general use in the TiCC software stack and beyond."; homepage = "https://github.com/LanguageMachines/ticcutils"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix index 2e758257cbb..de22c41ec49 100644 --- a/pkgs/development/libraries/languagemachines/timbl.nix +++ b/pkgs/development/libraries/languagemachines/timbl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , automake, autoconf, libtool, pkg-config, autoconf-archive , libxml2, bzip2, libtar , languageMachines @@ -20,7 +20,7 @@ stdenv.mkDerivation { ]; preConfigure = "sh bootstrap.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "TiMBL implements several memory-based learning algorithms"; homepage = "https://github.com/LanguageMachines/timbl/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix index 56245f922d3..27812e8b3f0 100644 --- a/pkgs/development/libraries/languagemachines/timblserver.nix +++ b/pkgs/development/libraries/languagemachines/timblserver.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive , libxml2 , languageMachines @@ -21,7 +21,7 @@ stdenv.mkDerivation { ]; preConfigure = "sh bootstrap.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "This server for TiMBL implements several memory-based learning algorithms"; homepage = "https://github.com/LanguageMachines/timblserver/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix index e089942cd74..d8c8d99552c 100644 --- a/pkgs/development/libraries/languagemachines/ucto.nix +++ b/pkgs/development/libraries/languagemachines/ucto.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , automake, autoconf, libtool, pkg-config, autoconf-archive , libxml2, icu, bzip2, libtar , languageMachines @@ -32,7 +32,7 @@ stdenv.mkDerivation { done; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A rule-based tokenizer for natural language"; homepage = "https://languagemachines.github.io/ucto/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix index 9d36a95b498..cad63622724 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , automake, autoconf, libtool, pkg-config, autoconf-archive }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ automake autoconf libtool autoconf-archive ]; preConfigure = "sh bootstrap.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "A rule-based tokenizer for natural language"; homepage = "https://languagemachines.github.io/ucto/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix index 25d858cb64a..22f0436edca 100644 --- a/pkgs/development/libraries/lasem/default.nix +++ b/pkgs/development/libraries/lasem/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkg-config, intltool, gobject-introspection, glib, gdk-pixbuf +{ fetchurl, lib, stdenv, pkg-config, intltool, gobject-introspection, glib, gdk-pixbuf , libxml2, cairo, pango, gnome3 }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "man" "doc" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0fds3fsx84ylsfvf55zp65y8xqjj5n8gbhcsk02vqglivk7izw4v"; }; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { description = "SVG and MathML rendering library"; homepage = "https://wiki.gnome.org/Projects/Lasem"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index f2224a872dd..24efa689c58 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkg-config, python27Packages, xmlsec, zlib }: +{ lib, stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkg-config, python27Packages, xmlsec, zlib }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --prefix=$out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://lasso.entrouvert.org/"; description = "Liberty Alliance Single Sign-On library"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix index 8fe2484faca..9a957a11924 100644 --- a/pkgs/development/libraries/lcms/default.nix +++ b/pkgs/development/libraries/lcms/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "lcms"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Color management engine"; homepage = "http://www.littlecms.com/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 6e81dfc0718..129b5785198 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtiff, libjpeg, zlib }: +{ lib, stdenv, fetchurl, libtiff, libjpeg, zlib }: stdenv.mkDerivation rec { name = "lcms2-2.11"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # See https://trac.macports.org/ticket/60656 LDFLAGS = if stdenv.hostPlatform.isDarwin then "-Wl,-w" else null; - meta = with stdenv.lib; { + meta = with lib; { description = "Color management engine"; homepage = "http://www.littlecms.com/"; license = licenses.mit; diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix index 36a0c8e1316..36092507b8a 100644 --- a/pkgs/development/libraries/ldacbt/default.nix +++ b/pkgs/development/libraries/ldacbt/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "AOSP libldac dispatcher"; homepage = "https://github.com/EHfive/ldacBT"; license = licenses.asl20; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 9810234eefa..ba035eed05b 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python3 , pkg-config @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { stripDebugList = [ "bin" "lib" "modules" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A LDAP-like embedded database"; homepage = "https://ldb.samba.org/"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index f64d263901b..5873e707e7c 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, perl, which, dns-root-data }: +{ lib, stdenv, fetchurl, openssl, perl, which, dns-root-data }: stdenv.mkDerivation rec { pname = "ldns"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--with-drill" "--disable-gost" "--with-examples" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { moveToOutput "bin/ldns-config" "$dev" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library with the aim of simplifying DNS programming in C"; license = licenses.bsd3; homepage = "http://www.nlnetlabs.nl/projects/ldns/"; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 7f1c292c5f1..8a9c80a6175 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, cmake, curl, ruby }: +{ lib, stdenv, fetchFromGitHub, boost, cmake, curl, ruby }: stdenv.mkDerivation rec { pname = "leatherman"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost curl ruby ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/puppetlabs/leatherman/"; description = "A collection of C++ and CMake utility libraries"; license = licenses.asl20; diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index e9e8d3447b9..23675c9f9f8 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }: let version = "0.3.95"; @@ -35,10 +35,10 @@ stdenv.mkDerivation { cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ flokli ]; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; description = "An opensource database of photographic lenses and their characteristics"; homepage = "https://lensfun.github.io"; }; diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index de874cea3f1..11f1c7fd9c6 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkg-config, which, gnuplot +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, which, gnuplot , giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Image processing and analysis library"; homepage = "http://www.leptonica.org/"; - license = stdenv.lib.licenses.bsd2; # http://www.leptonica.org/about-the-license.html - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd2; # http://www.leptonica.org/about-the-license.html + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index 6e68a9128d0..d0ba4718655 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibsWrapper, libXp, libXau}: +{lib, stdenv, fetchurl, xlibsWrapper, libXp, libXau}: stdenv.mkDerivation rec { name = "lesstif-0.95.2"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ./c-xpmpipethrough.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source clone of the Motif widget set"; homepage = "http://lesstif.sourceforge.net"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 14d426701ba..0a1dabef328 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fixDarwinDylibNames, snappy }: +{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, snappy }: stdenv.mkDerivation rec { pname = "leveldb"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ snappy ]; nativeBuildInputs = [] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildPhase = '' make all @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cp out-static/leveldbutil $out/bin "; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/google/leveldb"; description = "Fast and lightweight key/value database library by Google"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index 7cf6329a77e..c5d6877a844 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "levmar-2.6"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++"; homepage = "https://www.ics.forth.gr/~lourakis/levmar/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix index 39e3e2e660f..db0bd26f4d2 100644 --- a/pkgs/development/libraries/lib3ds/default.nix +++ b/pkgs/development/libraries/lib3ds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { name = "lib3ds-1.3.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files"; homepage = "http://lib3ds.sourceforge.net/"; license = "LGPL"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/development/libraries/lib3mf/default.nix index 10732a14e48..fec910bd595 100644 --- a/pkgs/development/libraries/lib3mf/default.nix +++ b/pkgs/development/libraries/lib3mf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, libuuid, libossp_uuid, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, ninja, libuuid, libossp_uuid, gtest }: stdenv.mkDerivation rec { pname = "lib3mf"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3MF.pc.in ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Reference implementation of the 3D Manufacturing Format file standard"; homepage = "https://3mf.io/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix index 8936603d18b..1c88459ba9b 100644 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation { pname = "libAfterImage"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ zlib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.afterstep.org/afterimage/"; description = "A generic image manipulation library"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index 59afede9cae..c059b9d412a 100644 --- a/pkgs/development/libraries/libHX/default.nix +++ b/pkgs/development/libraries/libHX/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool }: +{ lib, stdenv, fetchurl, autoconf, automake, libtool }: stdenv.mkDerivation rec { name = "libHX-3.22"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sh autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libhx.sourceforge.net/"; longDescription = '' libHX is a C library (with some C++ bindings available) that provides data structures diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 714708a6e0d..7d762fc8077 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: stdenv.mkDerivation rec { name = "libLAS-1.8.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ]; cmakeFlags = [ @@ -20,15 +20,15 @@ stdenv.mkDerivation rec { "-DCMAKE_EXE_LINKER_FLAGS=-pthread" ]; - postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.isDarwin '' install_name_tool -change "@rpath/liblas.3.dylib" "$out/lib/liblas.3.dylib" $out/lib/liblas_c.dylib ''; meta = { description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset"; homepage = "https://liblas.org"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.michelk ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.michelk ]; }; } diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index d6c90ee172b..c3934db5b3f 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }: +{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }: # library that allows libbluray to play AACS protected bluray disks # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ yacc flex ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.videolan.org/developers/libaacs.html"; description = "Library to access AACS protected Blu-Ray disks"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix index fdfd855470d..e3c960681c5 100644 --- a/pkgs/development/libraries/libaal/default.nix +++ b/pkgs/development/libraries/libaal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "1.0.6"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.namesys.com/"; description = "Support library for Reiser4"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix index c2d81e31f3e..7543c6ddff7 100644 --- a/pkgs/development/libraries/libabigail/default.nix +++ b/pkgs/development/libraries/libabigail/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoreconfHook , elfutils @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { patchShebangs tests/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ABI Generic Analysis and Instrumentation Library"; homepage = "https://sourceware.org/libabigail/"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index 4e33f30e8c1..f1c4f49adc6 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, doxygen, gperf, pkg-config, librevenge, libxml2, perl }: +{ lib, stdenv, fetchurl, boost, doxygen, gperf, pkg-config, librevenge, libxml2, perl }: stdenv.mkDerivation rec { pname = "libabw"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost doxygen gperf librevenge libxml2 perl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libabw"; description = "Library parsing abiword documents"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index 3467b6c84c8..8dfc222f36a 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, meson, ninja, glib, check, python3, vala, gtk-doc, glibcLocales +{ lib, stdenv, fetchFromGitLab, meson, ninja, glib, check, python3, vala, gtk-doc, glibcLocales , libxml2, libxslt, pkg-config, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: stdenv.mkDerivation rec { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for managing accounts which can be used from GLib applications"; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libaec/default.nix b/pkgs/development/libraries/libaec/default.nix index bf6fd029de1..4c539860be7 100644 --- a/pkgs/development/libraries/libaec/default.nix +++ b/pkgs/development/libraries/libaec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab +{ lib, stdenv, fetchFromGitLab , cmake }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.dkrz.de/k202009/libaec"; description = "Adaptive Entropy Coding library"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index 708aaff9bda..7aeccdf583e 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libtool, perl, bsdbuild, gettext, mandoc +{ lib, stdenv, fetchurl, pkg-config, libtool, perl, bsdbuild, gettext, mandoc , libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU, libGL , libsndfile, portaudio, libmysqlclient, fontconfig }: @@ -33,7 +33,7 @@ stdenv.mkDerivation { freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform GUI toolkit"; homepage = "http://libagar.org/index.html"; license = with licenses; bsd3; diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index 4de113718d4..2b31da7aa53 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }: +{ lib, stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }: let srcs = import ./srcs.nix { inherit fetchurl; }; in stdenv.mkDerivation { @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ perl bsdbuild libagar libjpeg libpng openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tests for libagar"; homepage = "http://libagar.org/index.html"; license = with licenses; bsd3; diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index eca7170bfff..2985d4ad212 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl }: +{ lib, stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { pname = "libamqpcpp"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for communicating with a RabbitMQ server"; homepage = "https://github.com/CopernicaMarketingSoftware/AMQP-CPP"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix index 4c3d1d2a213..d51eac7bdb6 100644 --- a/pkgs/development/libraries/libantlr3c/default.nix +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "libantlr3c-3.4"; @@ -7,9 +7,9 @@ stdenv.mkDerivation { sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; }; - configureFlags = stdenv.lib.optional stdenv.is64bit "--enable-64bit"; + configureFlags = lib.optional stdenv.is64bit "--enable-64bit"; - meta = with stdenv.lib; { + meta = with lib; { description = "C runtime libraries of ANTLR v3"; homepage = "https://www.antlr3.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index e702e292a0f..99d38f0cfc4 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { longDescription = '' Libao is Xiph.org's cross-platform audio library that allows programs to output audio using a simple API on a wide variety of diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 2ebabe3273f..9706cda03f8 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, yasm, perl, cmake, pkg-config, python3 }: +{ lib, stdenv, fetchgit, yasm, perl, cmake, pkg-config, python3 }: stdenv.mkDerivation rec { pname = "libaom"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" "dev" "static" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Alliance for Open Media AV1 codec library"; longDescription = '' Libaom is the reference implementation of the AV1 codec from the Alliance diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix index 38c501a8287..a6b9d531abf 100644 --- a/pkgs/development/libraries/libaosd/default.nix +++ b/pkgs/development/libraries/libaosd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, cairo, pango, +{ lib, stdenv, fetchFromGitHub, pkg-config, cairo, pango, libX11, libXcomposite, autoconf, automake }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { longDescription = '' libaosd is an advanced on screen display library. diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 6bc2ddb7d13..a8fb7e38265 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,5 +1,5 @@ { - fetchFromGitHub, stdenv, pkg-config, autoreconfHook, + fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook, acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd, # Optional but increases closure only negligibly. Also, while libxml2 @@ -25,15 +25,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = - stdenv.lib.optional stdenv.hostPlatform.isUnix sharutils + lib.optional stdenv.hostPlatform.isUnix sharutils ++ [ zlib bzip2 openssl xz lzo zstd ] - ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] - ++ stdenv.lib.optional xarSupport libxml2; + ++ lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] + ++ lib.optional xarSupport libxml2; # Without this, pkg-config-based dependencies are unhappy - propagatedBuildInputs = stdenv.lib.optionals stdenv.isLinux [ attr acl ]; + propagatedBuildInputs = lib.optionals stdenv.isLinux [ attr acl ]; - configureFlags = stdenv.lib.optional (!xarSupport) "--without-xml2"; + configureFlags = lib.optional (!xarSupport) "--without-xml2"; preBuild = if stdenv.isCygwin then '' echo "#include " >> config.h @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { ''; homepage = "http://libarchive.org"; changelog = "https://github.com/libarchive/libarchive/releases/tag/v${version}"; - license = stdenv.lib.licenses.bsd3; - platforms = with stdenv.lib.platforms; all; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = lib.licenses.bsd3; + platforms = with lib.platforms; all; + maintainers = with lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index f559c10456b..2003c8957ff 100644 --- a/pkgs/development/libraries/libargon2/default.nix +++ b/pkgs/development/libraries/libargon2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, fixDarwinDylibNames }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libargon2"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "PKGCONFIG_REL=lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A key derivation function that was selected as the winner of the Password Hashing Competition in July 2015"; longDescription = '' A password-hashing function created by by Alex Biryukov, Daniel Dinu, and diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix index 561e7e1017d..8d5b6d128dd 100644 --- a/pkgs/development/libraries/libasr/default.nix +++ b/pkgs/development/libraries/libasr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libevent, openssl }: +{ lib, stdenv, fetchurl, libevent, openssl }: stdenv.mkDerivation rec { pname = "libasr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libevent openssl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/OpenSMTPD/libasr"; description = "Free, simple and portable asynchronous resolver library"; license = licenses.isc; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 031d36b58a8..6a180cb62c1 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, yasm +{ lib, stdenv, fetchurl, pkg-config, yasm , freetype, fribidi, harfbuzz , encaSupport ? true, enca ? null # enca support , fontconfigSupport ? true, fontconfig ? null # fontconfig support @@ -14,7 +14,7 @@ let mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libass"; version = "0.15.0"; diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index aa798668f8e..a531cdff5b9 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, npth, libgpgerror, buildPackages }: +{ fetchurl, lib, stdenv, gettext, npth, libgpgerror, buildPackages }: stdenv.mkDerivation rec { pname = "libassuan"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed -i 's,#include ,#include "${libgpgerror.dev}/include/gpg-error.h",g' $dev/include/assuan.h ''; - meta = with stdenv.lib; { + meta = with lib; { description = "IPC library used by GnuPG and related software"; longDescription = '' Libassuan is a small library implementing the so-called Assuan diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index 8dae2f92b4d..b48971bc431 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pkg-config }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library of Assorted Spiffy Things"; homepage = "https://www.eterm.org"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix index 9a91551c3a4..0dc26b68611 100644 --- a/pkgs/development/libraries/libasyncns/default.nix +++ b/pkgs/development/libraries/libasyncns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libasyncns-0.8"; @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { sha256 = "0x5b6lcic4cd7q0bx00x93kvpyzl7n2abbgvqbrlzrfb8vknc6jg"; }; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://0pointer.de/lennart/projects/libasyncns/"; description = "A C library for Linux/Unix for executing name service queries asynchronously"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index b576896876e..995d3809e4e 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool }: +{ lib, stdenv, fetchurl, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "libatomic_ops"; @@ -14,17 +14,17 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; + nativeBuildInputs = lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; - preConfigure = stdenv.lib.optionalString stdenv.isCygwin '' + preConfigure = lib.optionalString stdenv.isCygwin '' sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am ./autogen.sh ''; meta = { description = ''A library for semi-portable access to hardware-provided atomic memory update operations''; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = with stdenv.lib.platforms; unix ++ windows; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = with lib.platforms; unix ++ windows; }; } diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index a1ee01100b4..f90815f4ee9 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, glib, dbus-glib }: +{ lib, stdenv, fetchurl, pkg-config, glib, dbus-glib }: stdenv.mkDerivation rec { name = "libaudclient-3.5-rc2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib dbus-glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Legacy D-Bus client library for Audacious"; homepage = "https://audacious-media-player.org/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index a712678b793..51aa634e408 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, yasm, bzip2, zlib, perl, bash +{ lib, stdenv, fetchurl, pkg-config, yasm, bzip2, zlib, perl, bash , mp3Support ? true, lame ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null @@ -17,7 +17,7 @@ assert faacSupport -> enableUnfree; -let inherit (stdenv.lib) optional hasPrefix enableFeature; in +let inherit (lib) optional hasPrefix enableFeature; in /* ToDo: - more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools @@ -52,7 +52,7 @@ let ''; configurePlatforms = []; - configureFlags = assert stdenv.lib.all (x: x!=null) buildInputs; [ + configureFlags = assert lib.all (x: x!=null) buildInputs; [ "--arch=${stdenv.hostPlatform.parsed.cpu.name}" "--target_os=${stdenv.hostPlatform.parsed.kernel.name}" #"--enable-postproc" # it's now a separate package in upstream @@ -120,7 +120,7 @@ let passthru = { inherit vdpauSupport; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libav.org/"; description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)"; license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix index 8f4a678cb37..d9c10415b67 100644 --- a/pkgs/development/libraries/libavc1394/default.nix +++ b/pkgs/development/libraries/libavc1394/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libraw1394 }: +{ lib, stdenv, fetchurl, pkg-config, libraw1394 }: stdenv.mkDerivation rec { name = "libavc1394-0.5.4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"; homepage = "https://sourceforge.net/projects/libavc1394/"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix index 25422c8b7d9..8c33e6f1b6d 100644 --- a/pkgs/development/libraries/libavif/default.nix +++ b/pkgs/development/libraries/libavif/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , libaom , cmake @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { dav1d ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C implementation of the AV1 Image File Format"; longDescription = '' Libavif aims to be a friendly, portable C implementation of the diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix index 248c33f7e0e..ef9823130f4 100644 --- a/pkgs/development/libraries/libayatana-appindicator/default.nix +++ b/pkgs/development/libraries/libayatana-appindicator/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gtk=${gtkVersion}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Ayatana Application Indicators Shared Library"; homepage = "https://github.com/AyatanaIndicators/libayatana-appindicator"; changelog = "https://github.com/AyatanaIndicators/libayatana-appindicator/blob/${version}/ChangeLog"; diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/development/libraries/libayatana-indicator/default.nix index dd9bc616944..c3c271c1719 100644 --- a/pkgs/development/libraries/libayatana-indicator/default.nix +++ b/pkgs/development/libraries/libayatana-indicator/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gtk=${gtkVersion}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Ayatana Indicators Shared Library"; homepage = "https://github.com/AyatanaIndicators/libayatana-indicator"; changelog = "https://github.com/AyatanaIndicators/libayatana-indicator/blob/${version}/ChangeLog"; diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix index dad5d40ea53..b142a0a4156 100644 --- a/pkgs/development/libraries/libb2/default.nix +++ b/pkgs/development/libraries/libb2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: stdenv.mkDerivation rec { pname = "libb2"; @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - configureFlags = stdenv.lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes"; + configureFlags = lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes"; nativeBuildInputs = [ autoconf automake libtool pkg-config ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The BLAKE2 family of cryptographic hash functions"; homepage = "https://blake2.net/"; platforms = platforms.all; diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 3c9a9768427..f524e9321f9 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "libb64"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "ANSI C routines for fast base64 encoding/decoding"; - license = stdenv.lib.licenses.publicDomain; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.publicDomain; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix index ea7f4eb9fa8..93927807af8 100644 --- a/pkgs/development/libraries/libbacktrace/default.nix +++ b/pkgs/development/libraries/libbacktrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub +{ lib, stdenv, callPackage, fetchFromGitHub , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { "--enable-static=${yesno enableStatic}" "--enable-shared=${yesno enableShared}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library that may be linked into a C/C++ program to produce symbolic backtraces"; homepage = https://github.com/ianlancetaylor/libbacktrace; maintainers = with maintainers; [ twey ]; diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index 411c3ae740f..7c458bae19c 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook, +{ lib, stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook, which }: stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { mkdir -p $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/binaryanalysisplatform/bap-bindings"; description = "A C library for interacting with BAP"; maintainers = [ maintainers.maurer ]; diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index c9b7bfa3c0e..ca7b305122e 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, libgpgerror, gettext }: +{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, gettext }: # library that allows libbluray to play BDplus protected bluray disks # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.videolan.org/developers/libbdplus.html"; description = "Library to access BD+ protected Blu-Ray disks"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 75db780b7bb..499f04349b5 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchpatch, gnu-config, autoreconfHook, bison, binutils-unwrapped , libiberty, zlib }: @@ -43,7 +43,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for manipulating containers of machine code"; longDescription = '' BFD is a library which provides a single interface to read and write diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 1ea610883b5..11a65006422 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc +{ lib, stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc , docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted , cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key , libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive @@ -40,10 +40,10 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/lvm-cache-stats --prefix PATH : \ - ${stdenv.lib.makeBinPath [ thin-provisioning-tools ]} + ${lib.makeBinPath [ thin-provisioning-tools ]} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for manipulating block devices"; homepage = "http://storaged.org/libblockdev/"; license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix index aff56994f49..6ba832fb3cd 100644 --- a/pkgs/development/libraries/libblocksruntime/default.nix +++ b/pkgs/development/libraries/libblocksruntime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, clang }: +{ lib, stdenv, fetchFromGitHub, clang }: stdenv.mkDerivation { name = "blocksruntime-20140624"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { installPhase = ''prefix="/" DESTDIR=$out ./installlib''; - meta = with stdenv.lib; { + meta = with lib; { description = "Installs the BlocksRuntime library from the compiler-rt"; homepage = "https://github.com/mackyle/blocksruntime"; license = licenses.mit; diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix index bf72720019c..7cb4c9e2b32 100644 --- a/pkgs/development/libraries/libbluedevil/default.nix +++ b/pkgs/development/libraries/libbluedevil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4 }: +{ lib, stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { pname = "libbluedevil"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 ]; meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 948b48b192d..3f90bb878ad 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration +{ lib, stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration , withJava ? false, jdk ? null, ant ? null , withAACS ? false, libaacs ? null , withBDplus ? false, libbdplus ? null @@ -6,7 +6,7 @@ , withFonts ? true, freetype ? null }: -with stdenv.lib; +with lib; assert withJava -> jdk != null && ant != null; assert withAACS -> libaacs != null; @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { ${optionalString withJava ''export JDK_HOME="${jdk.home}"''} ''; - configureFlags = with stdenv.lib; + configureFlags = with lib; optional (! withJava) "--disable-bdjava-jar" ++ optional (! withMetadata) "--without-libxml2" ++ optional (! withFonts) "--without-freetype" ; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.videolan.org/developers/libbluray.html"; description = "Library to access Blu-Ray disks for video playback"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 7aea38bdb58..778b61d8315 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "libbsd"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Common functions found on BSD systems"; homepage = "https://libbsd.freedesktop.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 1d2043b20cd..e03d7c19484 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, perl, stdenv, cmake }: +{ fetchFromGitHub, perl, lib, stdenv, cmake }: stdenv.mkDerivation rec { pname = "libbson"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A C Library for parsing, editing, and creating BSON documents"; homepage = "https://github.com/mongodb/libbson"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index 42c680835f1..02e73b0c04c 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libburn"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1xrp9c2sppbds0agqzmdym7rvdwpjrq6v6q2c3718cwvbjmh66c8"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libburnia-project.org/"; description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index f972feacda3..a84f010b9e6 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext , gtk-doc, libxslt, docbook_xml_dtd_43, docbook_xsl , python3, pcre2, gmp, mpfr }: @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { buildInputs = [ pcre2 gmp mpfr ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tiny library providing a C “class” for working with arbitrary big sizes in bytes"; homepage = src.meta.homepage; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 642b0a27aa6..ca879a60c7a 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, zlib, pkg-config, imlib2 +{ lib, stdenv, fetchurl, ncurses, zlib, pkg-config, imlib2 , x11Support ? !stdenv.isDarwin, libX11, libXext }: @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { (if x11Support then "--enable-x11" else "--disable-x11") ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING"; + NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING"; enableParallelBuilding = true; propagatedBuildInputs = [ ncurses zlib pkg-config (imlib2.override { inherit x11Support; }) ] - ++ stdenv.lib.optionals x11Support [ libX11 libXext ]; + ++ lib.optionals x11Support [ libX11 libXext ]; postInstall = '' mkdir -p $dev/bin @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://libcaca.zoy.org/"; description = "A graphics library that outputs text instead of pixels"; - license = stdenv.lib.licenses.wtfpl; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.wtfpl; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix index 8ba9e34c9d3..c484a49b1a2 100644 --- a/pkgs/development/libraries/libcacard/default.nix +++ b/pkgs/development/libraries/libcacard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, glib, nss }: +{ lib, stdenv, fetchurl, pkg-config, glib, nss }: stdenv.mkDerivation rec { pname = "libcacard"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib nss ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Smart card emulation library"; homepage = "https://gitlab.freedesktop.org/spice/libcacard"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index fb806aa2496..a2dfe1322f8 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = (stdenv.lib.optional stdenv.isDarwin) '' + postPatch = (lib.optional stdenv.isDarwin) '' patch -p0 < ${fetchpatch { url = "https://raw.githubusercontent.com/macports/macports-ports/master/audio/libcanberra/files/patch-configure.diff"; sha256 = "1f7h7ifpqvbfhqygn1b7klvwi80zmpv3538vbmq7ql7bkf1q8h31"; @@ -60,9 +60,9 @@ stdenv.mkDerivation rec { homepage = "http://0pointer.de/lennart/projects/libcanberra/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index 506c3a3d3d6..c6bbbcdb61a 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }: +{ lib, stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }: stdenv.mkDerivation rec { pname = "libcangjie"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { libcangjie is a library implementing the Cangjie input method. ''; homepage = "http://cangjians.github.io/projects/libcangjie/"; - license = stdenv.lib.licenses.lgpl3Plus; + license = lib.licenses.lgpl3Plus; - maintainers = [ stdenv.lib.maintainers.linquize ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.linquize ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index ae5154eac03..349b715d852 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, cmocka }: +{ lib, stdenv, fetchFromGitHub, cmake, cmocka }: stdenv.mkDerivation rec { pname = "libcbor"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_SHARED_LIBS=on" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "CBOR protocol implementation for C and others"; homepage = "https://github.com/PJK/libcbor"; license = licenses.mit; diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix index abc5f84a0e3..e5f6324e261 100644 --- a/pkgs/development/libraries/libcdaudio/default.nix +++ b/pkgs/development/libraries/libcdaudio/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "libcdaudio-0.99.12p2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { description = "A portable library for controlling audio CDs"; homepage = "http://libcdaudio.sourceforge.net"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl2; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 2b837ff1ce1..c1b28e22e10 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv }: +{ lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { name = "libcddb-1.3.2"; @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim"; }; - buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.isDarwin libiconv; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; doCheck = false; # fails 3 of 5 tests with locale errors - meta = with stdenv.lib; { + meta = with lib; { description = "C library to access data on a CDDB server (freedb.org)"; homepage = "http://libcddb.sourceforge.net/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index 92820772619..905d39dbd8e 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkg-config, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkg-config, libiconv, IOKit, DiskArbitration}: stdenv.mkDerivation { @@ -13,15 +13,15 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libcdio ] ++ - stdenv.lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ]; + lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ]; - propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin DiskArbitration; + propagatedBuildInputs = lib.optional stdenv.isDarwin DiskArbitration; - configureFlags = stdenv.lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.isDarwin [ "--disable-ld-version-script" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "CD paranoia on top of libcdio"; longDescription = '' This is a port of xiph.org's cdda paranoia to use libcdio for CDROM diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index e7705362894..cfe796b14d0 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcddb, pkg-config, ncurses, help2man, libiconv, Carbon, IOKit }: +{ lib, stdenv, fetchurl, libcddb, pkg-config, ncurses, help2man, libiconv, Carbon, IOKit }: stdenv.mkDerivation rec { name = "libcdio-2.1.0"; @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config help2man ]; buildInputs = [ libcddb ncurses ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ]; + ++ lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ]; doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for OS-independent CD-ROM and CD image access"; longDescription = '' GNU libcdio is a library for OS-independent CD-ROM and diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 20f45bc1bce..087c928b79c 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: +{ lib, stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: stdenv.mkDerivation rec { name = "libcdr-0.1.6"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A library providing ability to interpret and import Corel Draw drawings into various applications"; homepage = "http://www.freedesktop.org/wiki/Software/libcdr"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.mpl20; + platforms = lib.platforms.all; + license = lib.licenses.mpl20; }; } diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index e8c649c9660..341754376aa 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }: +{ lib, stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }: let version = "4.0.7"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ udev libcec_platform ] ++ - stdenv.lib.optional (libraspberrypi != null) libraspberrypi; + lib.optional (libraspberrypi != null) libraspberrypi; cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ]; @@ -22,11 +22,11 @@ stdenv.mkDerivation { substituteInPlace include/cecloader.h --replace "libcec.so" "$out/lib/libcec.so" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling"; homepage = "http://libcec.pulse-eight.com"; repositories.git = "https://github.com/Pulse-Eight/libcec.git"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.titanous ]; }; diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index 2132cf7a065..15972272a18 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: let version = "2.1.0.1"; in @@ -13,11 +13,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Platform library for libcec and Kodi addons"; homepage = "https://github.com/Pulse-Eight/platform"; repositories.git = "https://github.com/Pulse-Eight/platform.git"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.titanous ]; }; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 93aaebc110e..ec1a5ee3828 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig +{ lib, stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig , GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor , libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver , libXtst, nspr, nss, pango, libpulseaudio, systemd, at-spi2-atk, at-spi2-core @@ -6,7 +6,7 @@ let libPath = - stdenv.lib.makeLibraryPath [ + lib.makeLibraryPath [ alsaLib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2 libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cp -r ../include $out/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple framework for embedding Chromium-based browsers in other applications"; homepage = "http://opensource.spotify.com/cefbuilds/index.html"; maintainers = with maintainers; [ puffnfresh ]; diff --git a/pkgs/development/libraries/libcello/default.nix b/pkgs/development/libraries/libcello/default.nix index 908c9cb15dd..100077bcc70 100644 --- a/pkgs/development/libraries/libcello/default.nix +++ b/pkgs/development/libraries/libcello/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libcello"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://libcello.org/"; description = "Higher level programming in C"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.MostAwesomeDude ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.MostAwesomeDude ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index adf85428eea..22a062acd6e 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome3 +{ fetchurl, lib, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome3 , clutter-gtk, libsoup, gobject-introspection /*, libmemphis */ }: stdenv.mkDerivation rec { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.12.20"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0rihpb0npqpihqcdz4w03rq6xl7jdckfqskvv9diq2hkrnzv8ch2"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/libchamplain"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix index 168217678c0..260c332f7ef 100644 --- a/pkgs/development/libraries/libchardet/default.nix +++ b/pkgs/development/libraries/libchardet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl }: +{ lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { pname = "libchardet"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; homepage = "ftp://ftp.oops.org/pub/oops/libchardet/index.html"; license = licenses.mpl11; diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix index cd2df385f48..1436d4bd59d 100644 --- a/pkgs/development/libraries/libchewing/default.nix +++ b/pkgs/development/libraries/libchewing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sqlite }: +{ lib, stdenv, fetchurl, sqlite }: stdenv.mkDerivation rec { pname = "libchewing"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Intelligent Chinese phonetic input method"; homepage = "http://chewing.im/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 6e8ed7a04a2..f02ac04621f 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zlib, bzip2, libgcrypt +{ fetchurl, lib, stdenv, zlib, bzip2, libgcrypt , gdbm, gperf, tdb, gnutls, db, libuuid , lzo, pkg-config, guile, rpcsvc-proto, libtirpc }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sed -re 's%@GUILE@%&/guile%' -i */Makefile.* Makefile.* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools & library for data backup and distributed storage"; longDescription = diff --git a/pkgs/development/libraries/libck/default.nix b/pkgs/development/libraries/libck/default.nix index c4f38e96f3d..accb6556011 100644 --- a/pkgs/development/libraries/libck/default.nix +++ b/pkgs/development/libraries/libck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ck"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { dontDisableStatic = true; - meta = with stdenv.lib; { + meta = with lib; { description = "High-performance concurrency research library"; longDescription = '' Concurrency primitives, safe memory reclamation mechanisms and non-blocking data structures for the research, design and implementation of high performance concurrent systems. diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 0672e7942cb..a6334bf9998 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, llvmPackages }: +{ lib, stdenv, fetchFromGitHub, python, llvmPackages }: let llvm = llvmPackages.llvm; @@ -30,7 +30,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libclc.llvm.org/"; description = "Implementation of the library requirements of the OpenCL C programming language"; license = licenses.mit; diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index 6cabe1343c4..ceb0338e5cc 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl }: +{ lib, stdenv, fetchFromGitHub, fetchurl }: stdenv.mkDerivation rec { pname = "libcli"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Emulate a Cisco-style telnet command-line interface"; homepage = "http://sites.dparrish.com/libcli"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix index 37f77bb0d76..08601db0834 100644 --- a/pkgs/development/libraries/libcloudproviders/default.nix +++ b/pkgs/development/libraries/libcloudproviders/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }: # TODO: Add installed tests once https://gitlab.gnome.org/World/libcloudproviders/issues/4 is fixed @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "DBus API that allows cloud storage sync clients to expose their services"; homepage = "https://gitlab.gnome.org/World/libcloudproviders"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix index 53cff9a19d3..e4548420a05 100644 --- a/pkgs/development/libraries/libclthreads/default.nix +++ b/pkgs/development/libraries/libclthreads/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libclthreads"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ln $out/lib/libclthreads.so $out/lib/libclthreads.so.2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Zita thread library"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index c02a913613d..0d39a5e55b2 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkg-config }: +{ lib, stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkg-config }: stdenv.mkDerivation rec { pname = "libclxclient"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ln $out/lib/libclxclient.so $out/lib/libclxclient.so.3 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Zita X11 library"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index 1a97e544bb2..2898c9a1c83 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, libxml2, pkg-config, docbook2x, curl, autoreconfHook, cppunit }: +{ lib, stdenv, fetchFromGitHub, boost, libxml2, pkg-config, docbook2x, curl, autoreconfHook, cppunit }: stdenv.mkDerivation rec { pname = "libcmis"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ client library for the CMIS interface"; homepage = "https://sourceforge.net/projects/libcmis/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libco-canonical/default.nix b/pkgs/development/libraries/libco-canonical/default.nix index 689fbbb65bf..a01bbf7419c 100644 --- a/pkgs/development/libraries/libco-canonical/default.nix +++ b/pkgs/development/libraries/libco-canonical/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pkg-config }: +{ lib, stdenv, fetchFromGitHub, pkg-config }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libco-canonical"; diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix index f945434842e..df8db3ac9f8 100644 --- a/pkgs/development/libraries/libcollectdclient/default.nix +++ b/pkgs/development/libraries/libcollectdclient/default.nix @@ -1,5 +1,5 @@ -{ stdenv, collectd }: -with stdenv.lib; +{ lib, stdenv, collectd }: +with lib; collectd.overrideAttrs (oldAttrs: { name = "libcollectdclient-${collectd.version}"; @@ -12,7 +12,7 @@ collectd.overrideAttrs (oldAttrs: { postInstall = "rm -rf $out/{bin,etc,sbin,share}"; - meta = with stdenv.lib; { + meta = with lib; { description = "C Library for collectd, a daemon which collects system performance statistics periodically"; homepage = "http://collectd.org"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 3f91c8e579f..47360e11bc5 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , qtbase, qtdeclarative, qmake, which }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # Hack to avoid TMPDIR in RPATHs. preFixup = "rm -rf lib"; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform IRC framework written with Qt"; homepage = "https://communi.github.io"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index 7d7f95d757c..ae5f1176463 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libconfig"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.hyperrealm.com/libconfig"; description = "A simple library for processing structured configuration files"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index b7afe5ed03a..7545fe9617c 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, flex }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, flex }: stdenv.mkDerivation rec { pname = "libconfuse"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckTarget = "check"; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Small configuration file parser library for C"; longDescription = '' diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index aab90f8e37f..9f75eafdf24 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, libevent, openssl}: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libevent, openssl}: stdenv.mkDerivation rec { pname = "libcouchbase"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "C client library for Couchbase"; homepage = "https://github.com/couchbase/libcouchbase"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix index 20bcc9183ec..e7a6e6c9837 100644 --- a/pkgs/development/libraries/libcrafter/default.nix +++ b/pkgs/development/libraries/libcrafter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, autoconf, automake, libtool, libpcap }: +{ lib, stdenv, fetchzip, autoconf, automake, libtool, libpcap }: stdenv.mkDerivation rec { pname = "libcrafter"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/pellegre/libcrafter"; description = "High level C++ network packet sniffing and crafting library"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.lethalman ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.lethalman ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix index 1368cd30adb..902f5a6ee26 100644 --- a/pkgs/development/libraries/libcredis/default.nix +++ b/pkgs/development/libraries/libcredis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "libcredis-0.2.3"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { cp -v *.h "$out/include/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C client library for Redis (key-value database)"; homepage = "https://code.google.com/archive/p/credis/"; license = licenses.bsd3; # from homepage diff --git a/pkgs/development/libraries/libcrossguid/default.nix b/pkgs/development/libraries/libcrossguid/default.nix index 8e2be72987c..c81dbb86f6a 100644 --- a/pkgs/development/libraries/libcrossguid/default.nix +++ b/pkgs/development/libraries/libcrossguid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libuuid }: +{ lib, stdenv, fetchFromGitHub, libuuid }: stdenv.mkDerivation rec { name = "lib" + pname + "-" + version; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { install -D -m644 guid.h "$out/include/guid.h" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight cross platform C++ GUID/UUID library"; license = licenses.mit; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index 6a9b87d00d9..5fdd60abe11 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: stdenv.mkDerivation rec { pname = "libcryptui"; version = "3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0rh8wa5k2iwbwppyvij2jdxmnlfjbna7kbh2a5n7zw4nnjkx3ski"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Interface components for OpenPGP"; homepage = "https://gitlab.gnome.org/GNOME/libcryptui"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/development/libraries/libcsptr/default.nix index fcb5aa2bbfe..e30165054aa 100644 --- a/pkgs/development/libraries/libcsptr/default.nix +++ b/pkgs/development/libraries/libcsptr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "libcsptr"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Smart pointer constructs for the (GNU) C programming language"; homepage = "https://github.com/Snaipe/libcsptr"; license = licenses.mit; diff --git a/pkgs/development/libraries/libctb/default.nix b/pkgs/development/libraries/libctb/default.nix index 161c7c98c63..d52adac556d 100644 --- a/pkgs/development/libraries/libctb/default.nix +++ b/pkgs/development/libraries/libctb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libctb"; version = "0.16"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Communications toolbox"; homepage = "https://iftools.com"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix index b571e816fc4..2aa36bfe991 100644 --- a/pkgs/development/libraries/libctemplate/default.nix +++ b/pkgs/development/libraries/libctemplate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, autoconf, automake, libtool }: +{ lib, stdenv, fetchFromGitHub, python3, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "ctemplate"; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { embed application logic in this template language. ''; homepage = "https://github.com/OlafvdSpek/ctemplate"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index 73a110c07f6..227dfd77f46 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, bison, flex }: +{ lib, stdenv, fetchFromGitHub, cmake, bison, flex }: stdenv.mkDerivation rec { pname = "libcue"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails all the tests (ctest) - meta = with stdenv.lib; { + meta = with lib; { description = "CUE Sheet Parser Library"; longDescription = '' libcue is intended to parse a so called cue sheet from a char string or diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index d463e4af289..7a5c3984929 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, xercesc }: +{ lib, stdenv, fetchurl, xercesc }: stdenv.mkDerivation rec { pname = "libcutl"; version = "1.10.0"; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ utility library from Code Synthesis"; longDescription = '' libcutl is a C++ utility library. diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index d906e119dca..eeb034ed067 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "libdaemon-0.14"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-includes.patch ]; configureFlags = [ "--disable-lynx" ] - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ # Can't run this test while cross-compiling "ac_cv_func_setpgrp_void=yes" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight C library that eases the writing of UNIX daemons"; homepage = "http://0pointer.de/lennart/projects/libdaemon/"; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index a643c25f0bf..8eacd9706a8 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: +{ lib, stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { version = "3.20.6"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0jn5bi8k2lq6mmrsw7r1r5aviyf8gb39b2iy20v4kpkj5napzk1m"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ SDK which contains an implementation of DAP"; homepage = "https://www.opendap.org/software/libdap"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix index 168773662f6..f4e2df36d91 100644 --- a/pkgs/development/libraries/libdatrie/default.nix +++ b/pkgs/development/libraries/libdatrie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper , autoreconfHook, autoconf-archive , installShellFiles, libiconv }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installShellFiles ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.isDarwin libiconv; preAutoreconf = let reports = "https://github.com/tlwg/libdatrie/issues"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { installManPage man/trietool.1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://linux.thai.net/~thep/datrie/datrie.html"; description = "This is an implementation of double-array structure for representing trie"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index a4cc7d96593..d6ecb6e9747 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2 +{ lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome3 }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "13v7s46cgw135ycx0byn7am4inn33slrhljq0v0wwfwl2y1g52p1"; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to delight your users with fancy features"; longDescription = '' The libdazzle library is a companion library to GObject and GTK. It diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 871c9f97167..6a86d4941bf 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, libdbi +{ lib, stdenv, fetchurl, libdbi , libmysqlclient ? null , sqlite ? null , postgresql ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "libdbi-drivers-0.9.0"; diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix index 64c511503d0..48812f091be 100644 --- a/pkgs/development/libraries/libdbi/default.nix +++ b/pkgs/development/libraries/libdbi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libdbi-0.9.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "00s5ra7hdlq25iv23nwf4h1v3kmbiyzx0v9bhggjiii4lpf6ryys"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libdbi.sourceforge.net/"; description = "DB independent interface to DB"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 6b4be0db414..e44f3e37d20 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, cmake }: +{ lib, stdenv, fetchurl, qt4, cmake }: let baseName = "libdbusmenu-qt"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DWITH_DOC=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides a Qt implementation of the DBusMenu spec"; inherit homepage; inherit (qt4.meta) platforms; diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index d7eab296809..5ce811e9fea 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, qtbase }: +{ lib, stdenv, fetchgit, cmake, qtbase }: stdenv.mkDerivation rec { pname = "libdbusmenu-qt"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_DOC=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://launchpad.net/libdbusmenu-qt"; description = "Provides a Qt implementation of the DBusMenu spec"; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index 8a688ef37c6..a666eb3a650 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libraw1394 +{ lib, stdenv, fetchurl, libraw1394 , libusb1, CoreServices }: stdenv.mkDerivation rec { @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ libusb1 ] - ++ stdenv.lib.optional stdenv.isLinux libraw1394 - ++ stdenv.lib.optional stdenv.isDarwin CoreServices; + ++ lib.optional stdenv.isLinux libraw1394 + ++ lib.optional stdenv.isDarwin CoreServices; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/libdc1394/"; description = "Capture and control API for IIDC compliant cameras"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix index a398a6fab72..bbbcdc3f054 100644 --- a/pkgs/development/libraries/libde265/default.nix +++ b/pkgs/development/libraries/libde265/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { version = "1.0.8"; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/strukturag/libde265"; description = "Open h.265 video codec implementation"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ gebner ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ gebner ]; }; } diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index b674087c759..fa48c773dfc 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL +{ lib, stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL , libX11, pkg-config, OpenGL }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr libGL libX11 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ]; + ++ lib.optionals stdenv.isDarwin [ OpenGL ]; nativeBuildInputs = [ pkg-config ]; configureFlags = [ "--enable-ILU" "--enable-ILUT" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i 's, -std=gnu99,,g' configure sed -i 's,malloc.h,stdlib.h,g' src-ILU/ilur/ilur.c - '' + stdenv.lib.optionalString stdenv.cc.isClang '' + '' + lib.optionalString stdenv.cc.isClang '' sed -i 's/libIL_la_CXXFLAGS = $(AM_CFLAGS)/libIL_la_CXXFLAGS =/g' lib/Makefile.in ''; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://openil.sourceforge.net/"; description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index 5936853dcbc..7ee268e4e7d 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2, Security }: +{ lib, stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2, Security }: stdenv.mkDerivation rec { @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ openssl pcsclite opensc libxml2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isDarwin [ Security ]; - cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-DFRAMEWORK=OFF" ]; + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DFRAMEWORK=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for creating DigiDoc signature files"; homepage = "https://github.com/open-eid/libdigidoc"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index ad0f5f50bf2..f7170fa7f10 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl +{ lib, stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { xml-security-c xsd zlib xalanc ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for creating DigiDoc signature files"; homepage = "http://www.id.ee/"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index bdfb5d8b304..3021aced93f 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkg-config, darwin }: +{ lib, stdenv, fetchurl, cmake, pkg-config, darwin }: stdenv.mkDerivation rec { pname = "libdiscid"; @@ -6,16 +6,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pname}-${version}.tar.gz"; sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r"; }; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit"; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; homepage = "http://musicbrainz.org/doc/libdiscid"; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix index 5f9417bd03c..0f65a5cee5c 100644 --- a/pkgs/development/libraries/libdivecomputer/default.nix +++ b/pkgs/development/libraries/libdivecomputer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libdivecomputer"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.libdivecomputer.org"; description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; maintainers = [ maintainers.mguentner ]; diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix index 0d82db7cee4..0f332f8ac74 100644 --- a/pkgs/development/libraries/libdivsufsort/default.nix +++ b/pkgs/development/libraries/libdivsufsort/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "libdivsufsort-2.0.1"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/y-256/libdivsufsort"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; description = "Library to construct the suffix array and the BW transformed string"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index bd23b6831a0..994f010252f 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config }: +{ lib, stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { name = "libdmtx-0.7.4"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { meta = { description = "An open source software for reading and writing Data Matrix barcodes"; homepage = "http://libdmtx.org"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; maintainers = [ ]; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index 176e0a22aba..43d9d2077fe 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, autoconf, libtool}: +{lib, stdenv, fetchurl, automake, autoconf, libtool}: stdenv.mkDerivation { name = "libdnet-1.12"; @@ -22,8 +22,8 @@ stdenv.mkDerivation { meta = { description = "Provides a simplified, portable interface to several low-level networking routines"; homepage = "https://github.com/dugsong/libdnet"; - license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix index ed1e2cd74a3..ff3c7f6f863 100644 --- a/pkgs/development/libraries/libdv/default.nix +++ b/pkgs/development/libraries/libdv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, popt }: +{ lib, stdenv, fetchurl, popt }: stdenv.mkDerivation rec { name = "libdv-1.0.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # This fixes an undefined symbol: _sched_setscheduler error on compile. # See the apple docs: http://cl.ly/2HeF bottom of the "Finding Imported Symbols" section - LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup"; + LDFLAGS = lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup"; configureFlags = [ "--disable-asm" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ popt ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards"; homepage = "https://sourceforge.net/projects/libdv/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix index 327aacb6f37..5d539a7a488 100644 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "libdvbpsi"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { meta = { description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0"; homepage = "http://www.videolan.org/developers/libdvbpsi.html"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.lgpl21; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index f097aad702a..278e3d60d90 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -1,17 +1,17 @@ -{stdenv, fetchurl, IOKit}: +{lib, stdenv, fetchurl, IOKit}: stdenv.mkDerivation rec { pname = "libdvdcss"; version = "1.4.2"; - buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit; + buildInputs = lib.optional stdenv.isDarwin IOKit; src = fetchurl { url = "http://get.videolan.org/libdvdcss/${version}/${pname}-${version}.tar.bz2"; sha256 = "0x957zzpf4w2cp8zlk29prj8i2q6hay3lzdzsyz8y3cwxivyvhkq"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.videolan.org/developers/libdvdcss.html"; description = "A library for decrypting DVDs"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix index f5264587a16..1f832de5bb3 100644 --- a/pkgs/development/libraries/libdvdnav/4.2.1.nix +++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkg-config, libdvdread}: +{lib, stdenv, fetchurl, pkg-config, libdvdread}: stdenv.mkDerivation { name = "libdvdnav-4.2.1"; @@ -20,9 +20,9 @@ stdenv.mkDerivation { meta = { homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library that implements DVD navigation features such as DVD menus"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.wmertens ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.wmertens ]; + platforms = lib.platforms.linux; }; passthru = { inherit libdvdread; }; diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 5f26b943537..3eb1032b2a7 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkg-config, libdvdread}: +{lib, stdenv, fetchurl, pkg-config, libdvdread}: stdenv.mkDerivation rec { pname = "libdvdnav"; @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library that implements DVD navigation features such as DVD menus"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.wmertens ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.wmertens ]; + platforms = lib.platforms.unix; }; passthru = { inherit libdvdread; }; diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/pkgs/development/libraries/libdvdread/4.9.9.nix index 7f35c651b92..7049e1dd993 100644 --- a/pkgs/development/libraries/libdvdread/4.9.9.nix +++ b/pkgs/development/libraries/libdvdread/4.9.9.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libdvdcss}: +{lib, stdenv, fetchurl, libdvdcss}: stdenv.mkDerivation { name = "libdvdread-4.9.9"; @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library for reading DVDs"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.wmertens ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.wmertens ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 997018a2970..32dfe4ee0fa 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libdvdcss}: +{lib, stdenv, fetchurl, libdvdcss}: stdenv.mkDerivation rec { pname = "libdvdread"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library for reading DVDs"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.wmertens ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.wmertens ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index ba4ebaec111..0d512b04201 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libelf, zlib }: +{ lib, stdenv, fetchurl, libelf, zlib }: let version = "20181024"; @@ -11,8 +11,8 @@ let }; meta = { homepage = "https://www.prevanders.net/dwarf.html"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl21Plus; }; in rec { diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix index 9b1aa3132e9..5a0347e5954 100644 --- a/pkgs/development/libraries/libdwg/default.nix +++ b/pkgs/development/libraries/libdwg/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, indent}: +{lib, stdenv, fetchurl, indent}: stdenv.mkDerivation { name = "libdwg-0.6"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { meta = { description = "Library reading dwg files"; homepage = "http://libdwg.sourceforge.net/en/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index 2450ac6a9ea..4f1fd3904d9 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: let version = "0.7.2"; in stdenv.mkDerivation { @@ -31,7 +31,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; outputDoc = "dev"; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ dynamic ndarray library, with Python exposure"; homepage = "http://libdynd.org"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix index 96b341dceae..5575d8b2c5e 100644 --- a/pkgs/development/libraries/libe-book/default.nix +++ b/pkgs/development/libraries/libe-book/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gperf, pkg-config, librevenge, libxml2, boost, icu +{ lib, stdenv, fetchurl, gperf, pkg-config, librevenge, libxml2, boost, icu , cppunit, zlib, liblangtag }: @@ -34,8 +34,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''Library for import of reflowable e-book formats''; - license = stdenv.lib.licenses.lgpl21Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libe57format/default.nix b/pkgs/development/libraries/libe57format/default.nix index 137c73990f6..49b75906bdb 100644 --- a/pkgs/development/libraries/libe57format/default.nix +++ b/pkgs/development/libraries/libe57format/default.nix @@ -1,5 +1,5 @@ { - stdenv, + lib, stdenv, cmake, fetchFromGitHub, boost, @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { fi ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for reading & writing the E57 file format (fork of E57RefImpl)"; homepage = "https://github.com/asmaloney/libE57Format"; license = licenses.boost; diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index da7a186bea6..70fab2da568 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, strace, which }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, strace, which }: stdenv.mkDerivation rec { pname = "libeatmydata"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - ] ++ stdenv.lib.optionals doCheck [ strace which ]; + ] ++ lib.optionals doCheck [ strace which ]; # while we can *build* in parallel, the tests also run in parallel which does # not work with v105. Later versions (unreleased) have a fix for that. The @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Small LD_PRELOAD library to disable fsync and friends"; homepage = "https://www.flamingspork.com/projects/libeatmydata/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/development/libraries/libeb/default.nix index 2fdb1d071b6..fe0011f9c99 100644 --- a/pkgs/development/libraries/libeb/default.nix +++ b/pkgs/development/libraries/libeb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, zlib }: +{ lib, stdenv, fetchurl, perl, zlib }: stdenv.mkDerivation rec { pname = "libeb"; version = "4.4.3"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; buildInputs = [ zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C library for accessing Japanese CD-ROM books"; longDescription = '' The EB library is a library for accessing CD-ROM books, which are a diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 4d8d2c10b67..5a8f1f00316 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libebml"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=YES" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extensible Binary Meta Language library"; homepage = "https://dl.matroska.org/downloads/libebml/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index e349af41bcb..ba4f84f8c80 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }: stdenv.mkDerivation rec { version = "1.2.4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ speexdsp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Implementation of the EBU R128 loudness standard"; homepage = "https://github.com/jiixyj/libebur128"; license = licenses.mit; diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix index 957daf7dc41..29a0a63a03e 100644 --- a/pkgs/development/libraries/libechonest/default.nix +++ b/pkgs/development/libraries/libechonest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, qt4, qjson }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, qt4, qjson }: stdenv.mkDerivation rec { pname = "libechonest"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A C++/Qt wrapper around the Echo Nest API"; homepage = "https://projects.kde.org/projects/playground/libs/libechonest"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 09bd41dbed0..92f3eeb7995 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "libedit"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { -e 's,-lncurses[a-z]*,-L${ncurses.out}/lib -lncursesw,g' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.thrysoee.dk/editline/"; description = "A port of the NetBSD Editline library (libedit)"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index e8ffa37379e..7172df01e22 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libestr }: +{ lib, stdenv, fetchurl, pkg-config, libestr }: stdenv.mkDerivation { name = "libee-0.4.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.libee.org/"; description = "An Event Expression Library inspired by CEE"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix index 63507051207..c3a4986c832 100644 --- a/pkgs/development/libraries/libelf-freebsd/default.nix +++ b/pkgs/development/libraries/libelf-freebsd/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation (rec { src = fetchsvn { url = "svn://svn.code.sf.net/p/elftoolchain/code/trunk"; - rev = (stdenv.lib.strings.toInt version); + rev = (lib.strings.toInt version); name = "elftoolchain-${version}"; }; @@ -29,9 +29,9 @@ stdenv.mkDerivation (rec { homepage = "https://sourceforge.net/p/elftoolchain/wiki/Home/"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; - platforms = stdenv.lib.platforms.freebsd; + platforms = lib.platforms.freebsd; maintainers = [ ]; }; }) diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 2b56f973b5d..2b8cd51ba5f 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl, autoreconfHook, gettext }: @@ -27,26 +27,26 @@ stdenv.mkDerivation rec { configureFlags = [] # Configure check for dynamic lib support is broken, see # http://lists.uclibc.org/pipermail/uclibc-cvs/2005-August/019383.html - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "mr_cv_target_elf=yes" + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "mr_cv_target_elf=yes" # Libelf's custom NLS macros fail to determine the catalog file extension # on Darwin, so disable NLS for now. - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "--disable-nls"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-nls"; nativeBuildInputs = [ gettext ] # Need to regenerate configure script with newer version in order to pass # "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper` # which doesn't work with the bootstrapTools bash, so can only do this # for cross builds when `stdenv.shell` is a newer bash. - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) autoreconfHook; + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) autoreconfHook; meta = { description = "ELF object file access library"; homepage = "https://github.com/Distrotech/libelf"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libelfin/default.nix b/pkgs/development/libraries/libelfin/default.nix index 8a8de854fc9..950639850db 100644 --- a/pkgs/development/libraries/libelfin/default.nix +++ b/pkgs/development/libraries/libelfin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, substituteAll }: +{ lib, stdenv, fetchFromGitHub, python3, substituteAll }: stdenv.mkDerivation rec { pname = "libelfin"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/aclements/libelfin/"; license = licenses.mit; description = "C++11 ELF/DWARF parser"; diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index 54520116129..ee8dfb6e94f 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }: let avahiWithGtk = avahi.override { gtk3Support = true; }; @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1s3svb2slqjsrqfv50c2ymnqcijcxb5gnx6bfibwh9l5ga290n91"; }; @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Easy Publish and Consume Library"; homepage = "https://wiki.gnome.org/Projects/libepc"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/liberfa/default.nix b/pkgs/development/libraries/liberfa/default.nix index a1ca15536da..8ffd86cd316 100644 --- a/pkgs/development/libraries/liberfa/default.nix +++ b/pkgs/development/libraries/liberfa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "erfa"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Essential Routines for Fundamental Astronomy"; homepage = "https://github.com/liberfa/erfa"; maintainers = with maintainers; [ mir06 ]; diff --git a/pkgs/development/libraries/liberio/default.nix b/pkgs/development/libraries/liberio/default.nix index b4023d5f36a..7a40c1a83da 100644 --- a/pkgs/development/libraries/liberio/default.nix +++ b/pkgs/development/libraries/liberio/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , systemd @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Ettus Research DMA I/O Library"; homepage = "https://github.com/EttusResearch/liberio"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix index e5a7f5609a3..542cff712c8 100644 --- a/pkgs/development/libraries/libesmtp/default.nix +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { pname = "libESMTP"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "02zbniyz7qys1jmx3ghx21kxmns1wc3hmv80gp7ag7yra9f1m9nh"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://brianstafford.info/libesmtp/index.html"; description = "A Library for Posting Electronic Mail"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix index add7ea00a98..8699e83d0fd 100644 --- a/pkgs/development/libraries/libestr/default.nix +++ b/pkgs/development/libraries/libestr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libestr-0.1.11"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0910ifzcs8kpd3srrr4fvbacgh2zrc6yn7i4rwfj6jpzhlkjnqs6"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libestr.adiscon.com/"; description = "Some essentials for string handling"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 9f950ebb09c..750cb3974cf 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , # Note: -static hasn’t work on darwin static ? with stdenv.hostPlatform; isStatic && !isDarwin }: @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { sha256 = "1sjs4324is7fp21an4aas2z4dwsvs6z4xwrmp72vwpq1s6wbfzjh"; }; - configureFlags = stdenv.lib.optional (static) "LDFLAGS=-static"; + configureFlags = lib.optional (static) "LDFLAGS=-static"; meta = { description = "A high-performance event loop/event model with lots of features"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.bsd2; # or GPL2+ + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.all; + license = lib.licenses.bsd2; # or GPL2+ }; } diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index ba846ed07db..daae6984ab2 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python3 }: +{ lib, stdenv, fetchurl, fetchpatch, python3 }: stdenv.mkDerivation rec { pname = "libevdev"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wrapper library for evdev devices"; homepage = "http://www.freedesktop.org/software/libevdev/doc/latest/index.html"; license = licenses.mit; diff --git a/pkgs/development/libraries/libevdevplus/default.nix b/pkgs/development/libraries/libevdevplus/default.nix index d094bc35142..66c5f1b0696 100644 --- a/pkgs/development/libraries/libevdevplus/default.nix +++ b/pkgs/development/libraries/libevdevplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libevdevplus"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Easy-to-use event device library in C++"; license = licenses.mit; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index cbde3206717..b33e94114f6 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, findutils, fixDarwinDylibNames +{ lib, stdenv, fetchurl, findutils, fixDarwinDylibNames , sslSupport? true, openssl }: @@ -16,25 +16,25 @@ stdenv.mkDerivation rec { # libevent_openssl is moved into its own output, so that openssl isn't present # in the default closure. outputs = [ "out" "dev" ] - ++ stdenv.lib.optional sslSupport "openssl" + ++ lib.optional sslSupport "openssl" ; outputBin = "dev"; propagatedBuildOutputs = [ "out" ] - ++ stdenv.lib.optional sslSupport "openssl" + ++ lib.optional sslSupport "openssl" ; nativeBuildInputs = [] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ; buildInputs = [] - ++ stdenv.lib.optional sslSupport openssl - ++ stdenv.lib.optional stdenv.isCygwin findutils + ++ lib.optional sslSupport openssl + ++ lib.optional stdenv.isCygwin findutils ; doCheck = false; # needs the net - postInstall = stdenv.lib.optionalString sslSupport '' + postInstall = lib.optionalString sslSupport '' moveToOutput "lib/libevent_openssl*" "$openssl" substituteInPlace "$dev/lib/pkgconfig/libevent_openssl.pc" \ --replace "$out" "$openssl" @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Event notification library"; longDescription = '' The libevent API provides a mechanism to execute a callback function diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index 759c0e40adc..b2246905456 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zlib, openssl, libuuid, pkg-config }: +{ fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config }: stdenv.mkDerivation rec { version = "20201129"; @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { meta = { description = "Library for support of the Expert Witness Compression Format"; homepage = "https://sourceforge.net/projects/libewf/"; - license = stdenv.lib.licenses.lgpl3; - maintainers = [ stdenv.lib.maintainers.raskin ] ; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.raskin ] ; + platforms = lib.platforms.unix; inherit version; }; } diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix index feee754590b..f3f89209707 100644 --- a/pkgs/development/libraries/libexecinfo/default.nix +++ b/pkgs/development/libraries/libexecinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , enableStatic ? true , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -33,21 +33,21 @@ stdenv.mkDerivation rec { makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ]; buildFlags = - stdenv.lib.optional enableStatic "static" - ++ stdenv.lib.optional enableShared "dynamic"; + lib.optional enableStatic "static" + ++ lib.optional enableShared "dynamic"; patchFlags = [ "-p0" ]; installPhase = '' install -Dm644 execinfo.h stacktraverse.h -t $out/include - '' + stdenv.lib.optionalString enableShared '' + '' + lib.optionalString enableShared '' install -Dm755 libexecinfo.so.1 -t $out/lib ln -s $out/lib/libexecinfo.so{.1,} - '' + stdenv.lib.optionalString enableStatic '' + '' + lib.optionalString enableStatic '' install -Dm755 libexecinfo.a -t $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Quick-n-dirty BSD licensed clone of the GNU libc backtrace facility"; license = licenses.bsd2; homepage = "https://www.freshports.org/devel/libexecinfo"; diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index a0f831e927e..20e69c4ad66 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }: stdenv.mkDerivation rec { pname = "libexif"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libexif.github.io/"; description = "A library to read and manipulate EXIF data in digital photographs"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 68c4fe807b3..59916bfb33f 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, substituteAll +{ fetchurl, lib, stdenv, substituteAll , libtool, gettext, zlib, bzip2, flac, libvorbis , exiv2, libgsf, rpm, pkg-config, fetchpatch , gstreamerSupport ? true, gst_all_1 ? null @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { sha256 = "01xhcjbzv6p53wz7y2ii76kb8m9iwvnm4ip9w4a0bpgaxqz4b9fw"; excludes = [ "ChangeLog" ]; }) - ] ++ stdenv.lib.optionals gstreamerSupport [ + ] ++ lib.optionals gstreamerSupport [ # Libraries cannot be wrapped so we need to hardcode the plug-in paths. (substituteAll { src = ./gst-hardcode-plugins.patch; - load_gst_plugins = stdenv.lib.concatMapStrings + load_gst_plugins = lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') (gstPlugins gst_all_1); }) @@ -62,10 +62,10 @@ stdenv.mkDerivation rec { [ libtool gettext zlib bzip2 flac libvorbis exiv2 libgsf rpm pkg-config - ] ++ stdenv.lib.optionals gstreamerSupport + ] ++ lib.optionals gstreamerSupport ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) - ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ] - ++ stdenv.lib.optionals videoSupport [ ffmpeg_3 libmpeg2 ]; + ++ lib.optionals gtkSupport [ glib gtk3 ] + ++ lib.optionals videoSupport [ ffmpeg_3 libmpeg2 ]; configureFlags = [ "--disable-ltdl-install" @@ -105,9 +105,9 @@ stdenv.mkDerivation rec { additional MIME types are detected. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index 3adb606dd2d..8e5cc8685da 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libexttextcat-3.4.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An N-Gram-Based Text Categorization library primarily intended for language guessing"; homepage = "https://wiki.documentfoundation.org/Libexttextcat"; platforms = platforms.all; diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index 66b193d4ea8..85ff493ca04 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { name = "libf2c-20160102"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "F2c converts Fortran 77 source code to C"; homepage = "http://www.netlib.org/f2c/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index 4e7cc1df069..3e568759c1b 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXi, libXtst, pkg-config, xorgproto }: +{ lib, stdenv, fetchurl, libX11, libXi, libXtst, pkg-config, xorgproto }: stdenv.mkDerivation rec { pname = "libfakekey"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXi libXtst xorgproto ]; NIX_LDFLAGS = "-lX11"; - meta = with stdenv.lib; { + meta = with lib; { description = "X virtual keyboard library"; homepage = "https://www.yoctoproject.org/tools-resources/projects/matchbox"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index 6c751e07b83..170bb116a8a 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "libfaketime"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./no-date-in-gzip-man-page.patch - ] ++ (stdenv.lib.optionals stdenv.cc.isClang [ + ] ++ (lib.optionals stdenv.cc.isClang [ # https://github.com/wolfcw/libfaketime/issues/277 ./0001-Remove-unsupported-clang-flags.patch ]); @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { PREFIX = placeholder "out"; LIBDIRNAME = "/lib"; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation"; checkInputs = [ perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Report faked system time to programs without having to change the system-wide time"; homepage = "https://github.com/wolfcw/libfaketime/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libff/default.nix b/pkgs/development/libraries/libff/default.nix index 874f45cae70..72d2406aa82 100644 --- a/pkgs/development/libraries/libff/default.nix +++ b/pkgs/development/libraries/libff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, gmp, openssl, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, gmp, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "libff"; @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { # CMake is hardcoded to always build static library which causes linker # failure for Haskell applications depending on haskellPackages.hevm on macOS. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace libff/CMakeLists.txt --replace "STATIC" "SHARED" ''; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost gmp openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library for Finite Fields and Elliptic Curves"; changelog = "https://github.com/scipr-lab/libff/blob/develop/CHANGELOG.md"; homepage = "https://github.com/scipr-lab/libff"; diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index 7fdc04d116e..8967ec49a09 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libffcall"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { rm -rf $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Foreign function call library"; homepage = "https://www.gnu.org/software/libffcall/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index d7dad6d956d..29b76e34d65 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , autoreconfHook }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling. - meta = with stdenv.lib; { + meta = with lib; { description = "A foreign function call interface library"; longDescription = '' The libffi library provides a portable, high level programming diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index 75b483de6ac..f44ae4d01f2 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , cmake @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ hidapi libcbor openssl ] - ++ stdenv.lib.optionals stdenv.isLinux [ udev ]; + ++ lib.optionals stdenv.isLinux [ udev ]; cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = '' Provides library functionality for FIDO 2.0, including communication with a device over USB. ''; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index c9be4c6ba7f..fd7bce1c30f 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoreconfHook , gettext @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gettext gnutls nettle ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; + ++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://lib.filezilla-project.org/"; description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/development/libraries/libfishsound/default.nix index 6b931105415..72dc2986711 100644 --- a/pkgs/development/libraries/libfishsound/default.nix +++ b/pkgs/development/libraries/libfishsound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libvorbis, speex, flac, pkg-config }: +{ lib, stdenv, fetchurl, libvorbis, speex, flac, pkg-config }: stdenv.mkDerivation rec { name = "libfishsound-1.0.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://xiph.org/fishsound/"; description = "A simple programming interface for decoding and encoding audio data using Xiph.org codecs (FLAC, Speex and Vorbis)"; longDescription = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index 2c0ba2dcc3c..d8659b9e15f 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "libfixposix"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sionescu/libfixposix"; description = "Thin wrapper over POSIX syscalls and some replacement functionality"; license = licenses.boost; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 163a633df5c..dc835924125 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkg-config, vala +{ lib, stdenv, fetchurl, glib, intltool, menu-cache, pango, pkg-config, vala , extraOnly ? false , withGtk3 ? false, gtk2, gtk3 }: let gtk = if withGtk3 then gtk3 else gtk2; - inherit (stdenv.lib) optional; + inherit (lib) optional; in stdenv.mkDerivation rec { name = if extraOnly @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://blog.lxde.org/category/pcmanfm/"; license = licenses.lgpl21Plus; description = "A glib-based library for file management"; diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 2464679ac8a..f3f7313accb 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , pkg-config , meson @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fprint.freedesktop.org/"; description = "A library designed to make it easy to add support for consumer fingerprint readers"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 52c64ed8629..2576d426af5 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "libfpx-1.3.1-7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # Darwin gets misdetected as Windows without this - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-D__unix"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__unix"; patches = [ (fetchpatch { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" "" '' else null; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.imagemagick.org"; description = "A library for manipulating FlashPIX images"; license = "Flashpix"; diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index d9c0e10dad6..9fd8c1e6b61 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libnfc, openssl +{ lib, stdenv, fetchurl, pkg-config, libnfc, openssl , libobjc ? null }: stdenv.mkDerivation { @@ -11,9 +11,9 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libnfc openssl ] ++ stdenv.lib.optional stdenv.isDarwin libobjc; + buildInputs = [ libnfc openssl ] ++ lib.optional stdenv.isDarwin libobjc; - meta = with stdenv.lib; { + meta = with lib; { description = "The libfreefare project aims to provide a convenient API for MIFARE card manipulations"; license = licenses.lgpl3; homepage = "https://github.com/nfc-tools/libfreefare"; diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/development/libraries/libfsm/default.nix index 5edfd622347..5e3c40da82c 100644 --- a/pkgs/development/libraries/libfsm/default.nix +++ b/pkgs/development/libraries/libfsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , bmake }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "DFA regular expression library & friends"; homepage = "https://github.com/katef/libfsm"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 6c128e2947f..ae599a97529 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkg-config, libusb1, libconfuse +{ lib, stdenv, fetchurl, cmake, pkg-config, libusb1, libconfuse , cppSupport ? true, boost ? null , pythonSupport ? true, python3 ? null, swig ? null , docSupport ? true, doxygen ? null @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = with stdenv.lib; [ libconfuse ] + buildInputs = with lib; [ libconfuse ] ++ optionals cppSupport [ boost ] ++ optionals pythonSupport [ python3 swig ] ++ optionals docSupport [ doxygen ]; - preBuild = stdenv.lib.optionalString docSupport '' + preBuild = lib.optionalString docSupport '' make doc_i ''; @@ -32,12 +32,12 @@ stdenv.mkDerivation rec { mkdir -p "$out/etc/udev/rules.d/" cp ../packages/99-libftdi.rules "$out/etc/udev/rules.d/" cp -r doc/man "$out/share/" - '' + stdenv.lib.optionalString docSupport '' + '' + lib.optionalString docSupport '' mkdir -p "$out/share/libftdi/doc/" cp -r doc/html "$out/share/libftdi/doc/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to talk to FTDI chips using libusb"; homepage = "https://www.intra2net.com/en/developer/libftdi/"; license = with licenses; [ lgpl2 gpl2 ]; diff --git a/pkgs/development/libraries/libfyaml/default.nix b/pkgs/development/libraries/libfyaml/default.nix index 5ce8cd6c6a1..69b7bdc7d1e 100644 --- a/pkgs/development/libraries/libfyaml/default.nix +++ b/pkgs/development/libraries/libfyaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnum4 }: +{ lib, stdenv, fetchurl, gnum4 }: stdenv.mkDerivation rec { pname = "libfyaml"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gnum4 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pantoniou/libfyaml"; description = "Fully feature complete YAML parser and emitter, supporting the latest YAML spec and passing the full YAML testsuite"; license = licenses.mit; diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix index 4e9ce765b96..10705a2c164 100644 --- a/pkgs/development/libraries/libgadu/default.nix +++ b/pkgs/development/libraries/libgadu/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib}: +{lib, stdenv, fetchurl, zlib}: stdenv.mkDerivation { @@ -14,8 +14,8 @@ stdenv.mkDerivation { meta = { description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)"; homepage = "http://toxygen.net/libgadu/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl21; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix index 2d79a1b64dc..f059d6c73a2 100644 --- a/pkgs/development/libraries/libgaminggear/default.nix +++ b/pkgs/development/libraries/libgaminggear/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkg-config, gettext +{ lib, stdenv, fetchurl, cmake, pkg-config, gettext , gtk2, libcanberra, libnotify, pcre, sqlite, xorg , harfbuzz }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Provides functionality for gaming input devices"; homepage = "https://sourceforge.net/projects/libgaminggear/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix index 9de5cf2d2d1..f90ea502c40 100644 --- a/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0ydy7bgra5jbq9mxl5x031nif3m6y3balc6ndw2ngj11wnsjc61h"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ (fetchpatch { name = "fix-x86_64-apple-darwin.patch"; sha256 = "138sfwl1avpy19320dbd63mskspc1khlc93j1f1zmylxx3w19csi"; @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postInstall = '' sed -i 's,#include ,#include "${libgpgerror.dev}/include/gpg-error.h",g' $out/include/gcrypt.h - '' + stdenv.lib.optionalString enableCapabilities '' + '' + lib.optionalString enableCapabilities '' sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la ''; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/libgcrypt/"; description = "General-pupose cryptographic library"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index cd529cb06ee..6c6d73740f2 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap +{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap , buildPackages }: @@ -19,16 +19,16 @@ stdenv.mkDerivation rec { # The CPU Jitter random number generator must not be compiled with # optimizations and the optimize -O0 pragma only works for gcc. # The build enables -O2 by default for everything else. - hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; + hardeningDisable = lib.optional stdenv.cc.isClang "fortify"; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ libgpgerror ] - ++ stdenv.lib.optional stdenv.isDarwin gettext - ++ stdenv.lib.optional enableCapabilities libcap; + ++ lib.optional stdenv.isDarwin gettext + ++ lib.optional enableCapabilities libcap; configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-asm"; + ++ lib.optional stdenv.hostPlatform.isMusl "--disable-asm"; # Necessary to generate correct assembly when compiling for aarch32 on # aarch64 @@ -43,20 +43,20 @@ stdenv.mkDerivation rec { # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postFixup = '' sed -i 's,#include ,#include "${libgpgerror.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h" - '' + stdenv.lib.optionalString enableCapabilities '' + '' + lib.optionalString enableCapabilities '' sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la ''; # TODO: figure out why this is even necessary and why the missing dylib only crashes # random instead of every test - preCheck = stdenv.lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.isDarwin '' mkdir -p $out/lib cp src/.libs/libgcrypt.20.dylib $out/lib ''; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/libgcrypt/"; description = "General-purpose cryptographic library"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 3f8e6f01b34..73e71de4aac 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee +{ lib, stdenv, fetchurl, pkg-config, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee , overrideCC, gcc6, fetchpatch, autoreconfHook, gtk-doc, autoconf-archive, yelp-tools , mysqlSupport ? false, libmysqlclient ? null , postgresSupport ? false, postgresql ? null @@ -12,7 +12,7 @@ assert postgresSupport -> postgresql != null; version = "5.2.10"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g"; }; @@ -24,7 +24,7 @@ assert postgresSupport -> postgresql != null; }) ]; - configureFlags = with stdenv.lib; [ + configureFlags = with lib; [ "--with-mysql=${if mysqlSupport then "yes" else "no"}" "--with-postgres=${if postgresSupport then "yes" else "no"}" @@ -41,7 +41,7 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkg-config intltool itstool libxml2 gobject-introspection vala autoreconfHook gtk-doc autoconf-archive yelp-tools ]; - buildInputs = with stdenv.lib; [ gtk3 openssl libgee ] + buildInputs = with lib; [ gtk3 openssl libgee ] ++ optional (mysqlSupport) libmysqlclient ++ optional (postgresSupport) postgresql; @@ -51,7 +51,7 @@ assert postgresSupport -> postgresql != null; }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Database access library"; homepage = "https://www.gnome-db.org/"; license = [ licenses.lgpl2 licenses.gpl2 ]; diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index ea0484f710e..44a0e8bc212 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome3 +{ lib, stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome3 , mysqlSupport ? false , postgresSupport ? false }: @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1fyh15b3f8hmwbswalxk1g4l04yvvybksn5nm7gznn5jl5q010p9"; }; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ bindings for libgda"; homepage = "https://www.gnome-db.org/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 9c8ea6bb1c0..86e3f4274fc 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , meson @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0bj7ij6k3lxjn62jgh8vabr8vfjs48aylnnl3779warw5iwyzfga"; }; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GData API library"; homepage = "https://wiki.gnome.org/Projects/libgdata"; maintainers = with maintainers; [ raskin lethalman ] ++ teams.gnome.members; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 4a518818e8b..705205df396 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, glib, cairo, Carbon, fontconfig +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, cairo, Carbon, fontconfig , libtiff, giflib, libjpeg, libpng , libXrender, libexif, autoreconfHook, fetchpatch }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; - configureFlags = stdenv.lib.optional stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}"; + configureFlags = lib.optional stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}"; enableParallelBuilding = true; @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { [ glib cairo fontconfig libtiff giflib libjpeg libpng libXrender libexif ] - ++ stdenv.lib.optional stdenv.isDarwin Carbon; + ++ lib.optional stdenv.isDarwin Carbon; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so ''; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { make check -w ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems"; homepage = "https://www.mono-project.com/docs/gui/libgdiplus/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index a531a433a88..407b99b5a57 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "libgee"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pm525wm11dhwz24m8bpcln9547lmrigl6cxf3qsbg4cr3pyvdfh"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; homepage = "https://wiki.gnome.org/Projects/Libgee"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 1b973fd5eee..eb35d5316c0 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libtiff, libjpeg, proj, zlib, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, libtiff, libjpeg, proj, zlib, autoreconfHook }: stdenv.mkDerivation rec { version = "1.5.1"; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = { description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery"; homepage = "https://github.com/OSGeo/libgeotiff"; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.mit; + maintainers = [lib.maintainers.marcweber]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix index abd73ea5b75..e058c7ed5af 100644 --- a/pkgs/development/libraries/libgepub/default.nix +++ b/pkgs/development/libraries/libgepub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome3 , webkitgtk, libsoup, libxml2, libarchive }: stdenv.mkDerivation rec { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.6.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16dkyywqdnfngmwsgbyga0kl9vcnzczxi3lmhm27pifrq5f3k2n7"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GObject based library for handling and rendering epub documents"; license = licenses.lgpl21Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index baa9917cad2..f78a51db5de 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkg-config, libuuid }: +{ lib, stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkg-config, libuuid }: stdenv.mkDerivation rec { pname = "libgig"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.linuxsampler.org"; description = "Gigasampler file access library"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index b07b5b91249..fe36a9d663f 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnome3, meson, ninja, pkg-config, vala, libssh2 +{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkg-config, vala, libssh2 , gtk-doc, gobject-introspection, libgit2, glib, python3 }: stdenv.mkDerivation rec { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.99.0.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pmrcnsa7qdda73c3dxf47733mwprmj5ljpw3acxbj6r8k27anp0"; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 # this should really be a propagated input of python output ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A glib wrapper library around the libgit2 git access library"; homepage = "https://wiki.gnome.org/Projects/Libgit2-glib"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 8c9905a4287..cf8f5ab4878 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome3, +{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome3, libstartup_notification, libgtop, perlPackages, autoreconfHook, intltool, docbook_xsl, xauth }: @@ -79,8 +79,8 @@ stdenv.mkDerivation rec { programs in an X session. ''; homepage = "https://www.nongnu.org/gksu/"; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.romildo ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl2; + maintainers = [ lib.maintainers.romildo ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 92783d3ae0c..88ba7dacc22 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.cc.isClang "-Wno-error"); # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 - configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-tls"; + configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-tls"; outputs = [ "out" "dev" ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { passthru = { inherit (addOpenGLRunpath) driverLink; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The GL Vendor-Neutral Dispatch library"; homepage = "https://github.com/NVIDIA/libglvnd"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index fbb2499f24a..3f5a5961ba0 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool }: stdenv.mkDerivation rec { pname = "libgnome-keyring"; version = "2.32.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n"; }; @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { inherit (glib.meta) platforms maintainers; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; - license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; + license = with lib.licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index 17adb362cdb..62228b8837a 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { pname = "libgnomekbd"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Keyboard management library"; maintainers = teams.gnome.members; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index e7e16d769e7..a7d91d0c81a 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, groff, perl, pkg-config, python2, zlib, gnutls, +{ lib, stdenv, fetchurl, libtool, groff, perl, pkg-config, python2, zlib, gnutls, libidn2, libunistring, nghttp2 }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "--without-librtmp" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A fork of libcurl used by GNUnet"; homepage = "https://gnunet.org/en/gnurl.html"; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 972ca4c04a5..39d0b185660 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -65,7 +65,7 @@ in stdenv.mkDerivation (rec { doCheck = true; # not cross - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html"; description = "A small library that defines common error values for all GnuPG components"; diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index db9e03a045a..4dec3151a7c 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext , libusb1 , libtool , libexif @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { from digital cameras. ''; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus - license = stdenv.lib.licenses.lgpl21Plus; - platforms = with stdenv.lib.platforms; unix; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = lib.licenses.lgpl21Plus; + platforms = with lib.platforms; unix; + maintainers = with lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index d23a5238295..c7c9de67592 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { homepage = "https://gtkpod.sourceforge.net/"; description = "Library used by gtkpod to access the contents of an ipod"; license = "LGPL"; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix index 102361e5fb2..16595a12eb5 100644 --- a/pkgs/development/libraries/libgringotts/default.nix +++ b/pkgs/development/libraries/libgringotts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, zlib, bzip2, libmcrypt, libmhash }: +{ lib, stdenv, fetchurl, pkg-config, zlib, bzip2, libmcrypt, libmhash }: stdenv.mkDerivation rec { pname = "libgringotts"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib bzip2 libmcrypt libmhash ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A small library to encapsulate data in an encrypted structure"; homepage = "http://libgringotts.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix index 52cdf5e9027..963bf722b2a 100644 --- a/pkgs/development/libraries/libgroove/default.nix +++ b/pkgs/development/libraries/libgroove/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libav, SDL2, chromaprint, libebur128 }: +{ lib, stdenv, fetchFromGitHub, cmake, libav, SDL2, chromaprint, libebur128 }: stdenv.mkDerivation rec { version = "4.3.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libav SDL2 chromaprint libebur128 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Streaming audio processing library"; homepage = "https://github.com/andrewrk/libgroove"; license = licenses.mit; diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index 132fc6a8712..b8c7c7bc497 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }: let version = "0.7.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Glib abstaction to handle feeds in RSS, Atom and other formats"; homepage = "https://wiki.gnome.org/Projects/Libgrss"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index bdc024094c0..77fa161b773 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkg-config, intltool, gettext, glib, libxml2, zlib, bzip2 +{ fetchurl, lib, stdenv, pkg-config, intltool, gettext, glib, libxml2, zlib, bzip2 , perl, gdk-pixbuf, libiconv, libintl, gnome3 }: stdenv.mkDerivation rec { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.14.47"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"; }; @@ -28,12 +28,12 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GNOME's Structured File Library"; homepage = "https://www.gnome.org/projects/libgsf"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; longDescription = '' Libgsf aims to provide an efficient extensible I/O abstraction for diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix index d13c0940205..678af459a30 100644 --- a/pkgs/development/libraries/libgssglue/default.nix +++ b/pkgs/development/libraries/libgssglue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kerberos }: +{ lib, stdenv, fetchurl, kerberos }: stdenv.mkDerivation rec { name = "libgssglue-0.4"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { EOF ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.citi.umich.edu/projects/nfsv4/linux/"; description = "Exports a gssapi interface which calls other random gssapi libraries"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index 165b8018443..af4fe04a0b4 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , glib , pkg-config @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { version = "2.40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1m6jbqk8maa52gxrf223442fr5bvvxgb7ham6v039i3r1i62gwvq"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library that reads information about processes and the running system"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index d1ddf3812c0..feeae05bf52 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , udev @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0drf39qhsdz35kwb18hnfj2ig4yfxhfks66m783zlhnvy2narbhv"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library that provides GObject bindings for libudev"; homepage = "https://wiki.gnome.org/Projects/libgudev"; maintainers = [ maintainers.eelco ] ++ teams.gnome.members; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index ccc2778c0c0..0f56f8c97f3 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper , ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db , gmp, readline, file, numactl, libapparmor, jansson @@ -7,7 +7,7 @@ , appliance ? null , javaSupport ? false, jdk ? null }: -assert appliance == null || stdenv.lib.isDerivation appliance; +assert appliance == null || lib.isDerivation appliance; assert javaSupport -> jdk != null; stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { libtirpc ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ]) ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ]) - ++ stdenv.lib.optional javaSupport jdk; + ++ lib.optional javaSupport jdk; prePatch = '' # build-time scripts @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; configureFlags = [ "--disable-appliance" "--disable-daemon" "--with-distro=NixOS" ] - ++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; + ++ lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; patches = [ ./libguestfs-syms.patch ]; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; installFlags = [ "REALLY_INSTALL=yes" ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { done ''; - postFixup = stdenv.lib.optionalString (appliance != null) '' + postFixup = lib.optionalString (appliance != null) '' mkdir -p $out/{lib,lib64} ln -s ${appliance} $out/lib64/guestfs ln -s ${appliance} $out/lib/guestfs @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for accessing and modifying virtual machine disk images"; license = with licenses; [ gpl2 lgpl21 ]; homepage = "https://libguestfs.org/"; diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix index 55e89d87664..f82401f524f 100644 --- a/pkgs/development/libraries/libgumath/default.nix +++ b/pkgs/development/libraries/libgumath/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , libndtypes , libxnd @@ -25,7 +25,7 @@ stdenv.mkDerivation { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library supporting function dispatch on general data containers. C base and Python wrapper"; homepage = "https://xnd.io/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 80f897a1a53..9351d3f707f 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, libxml2, glib, gtk3, gettext, libsoup +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, libxml2, glib, gtk3, gettext, libsoup , gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, python3, tzdata, geocode-glib, vala, gnome3 }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0l74hc02rvzm4p530y539a67jwb080fqdaazdl8j0fr3xvq0j9yy"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to access weather information from online services for numerous locations"; homepage = "https://wiki.gnome.org/Projects/LibGWeather"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index c5289829851..f7392ffb7dd 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, cairo +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, cairo , libarchive, freetype, libjpeg, libtiff, gnome3, lcms2 }: @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.3.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A GObject based library for handling and rendering XPS documents"; homepage = "https://wiki.gnome.org/Projects/libgxps"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix index 5a7ab456acc..ff2093255cf 100644 --- a/pkgs/development/libraries/libhandy/0.x.nix +++ b/pkgs/development/libraries/libhandy/0.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala +{ lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 , gtk3, gnome3 , dbus, xvfb_run, libxml2 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meson test --print-errorlogs ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library full of GTK widgets for mobile phones"; homepage = "https://source.puri.sm/Librem5/libhandy"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 794502ed9b8..5ab6dde09d7 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "sha256-VZuzrMLDYkiJF+ty7SW9wYH0riaslNF3Y0zF00yGf3o="; }; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meson test --print-errorlogs ''; - meta = with stdenv.lib; { + meta = with lib; { changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${version}"; description = "Building blocks for modern adaptive GNOME apps"; homepage = "https://gitlab.gnome.org/GNOME/libhandy"; diff --git a/pkgs/development/libraries/libhangul/default.nix b/pkgs/development/libraries/libhangul/default.nix index eb62337c502..eea513a137c 100644 --- a/pkgs/development/libraries/libhangul/default.nix +++ b/pkgs/development/libraries/libhangul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "libhangul-0.1.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Core algorithm library for Korean input routines"; homepage = "https://github.com/choehwanjin/libhangul"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 634a991f49b..53c14027ff3 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, cmake, zlib, libpng }: +{ lib, stdenv, fetchzip, cmake, zlib, libpng }: stdenv.mkDerivation { name = "libharu-2.3.0"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { meta = { description = "Cross platform, open source library for generating PDF files"; homepage = "http://libharu.org/"; - license = stdenv.lib.licenses.zlib; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.zlib; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index 577457afdbf..ab0ad6fab23 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: # libhdhomerun requires UDP port 65001 to be open in order to detect and communicate with tuners. # If your firewall is enabled, make sure to have something like: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1v80jk056ii2iv2w7sq24i3prjrbhxql5vqhafs7vq54qmwvgbnb"; }; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + patchPhase = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile --replace "gcc" "cc" substituteInPlace Makefile --replace "-arch i386" "" ''; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp *.h $out/include/hdhomerun ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Implements the libhdhomerun protocol for use with Silicondust HDHomeRun TV tuners"; homepage = "https://www.silicondust.com/support/linux"; license = licenses.lgpl21Only; diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index ca8c189a9c8..b0872b9da1e 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libde265, x265, libpng, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libde265, x265, libpng, libjpeg, libaom }: stdenv.mkDerivation rec { @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.libheif.org/"; description = "ISO/IEC 23008-12:2017 HEIF image file format decoder and encoder"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ gebner ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ gebner ]; }; } diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index f4edb39af5d..f54929c5378 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch , gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }: let @@ -8,7 +8,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w"; }; @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to use HTTPSEverywhere in desktop applications"; homepage = "https://gitlab.gnome.org/GNOME/libhttpseverywhere"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index c7babb3038d..2040ef3bee0 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages +{ lib, stdenv, buildPackages , staticBuild ? stdenv.hostPlatform.isStatic }: @@ -15,13 +15,13 @@ stdenv.mkDerivation { postUnpack = "sourceRoot=\${sourceRoot}/libiberty"; configureFlags = [ "--enable-install-libiberty" ] - ++ stdenv.lib.optional (!staticBuild) "--enable-shared"; + ++ lib.optional (!staticBuild) "--enable-shared"; - postInstall = stdenv.lib.optionalString (!staticBuild) '' + postInstall = lib.optionalString (!staticBuild) '' cp pic/libiberty.a $out/lib*/libiberty.a ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gcc.gnu.org/"; license = licenses.lgpl2; description = "Collection of subroutines used by various GNU programs"; diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix index 8c46efa9710..b6df338f122 100644 --- a/pkgs/development/libraries/libibmad/default.nix +++ b/pkgs/development/libraries/libibmad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libibumad }: +{ lib, stdenv, fetchurl, libibumad }: stdenv.mkDerivation rec { name = "libibmad-1.3.13"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libibumad ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.openfabrics.org/"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix index 4c37f8564b0..6de97ad77cd 100644 --- a/pkgs/development/libraries/libibumad/default.nix +++ b/pkgs/development/libraries/libibumad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libibumad-1.3.10.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0bkygb3lbpaj6s4vsyixybrrkcnilbijv4ga5p1xdwyr3gip83sh"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.openfabrics.org/"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 7802f975202..7f5e739a99c 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/libical/libical"; description = "An Open Source implementation of the iCalendar protocols"; license = licenses.mpl20; diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix index 10d68ee3a4e..1df2a8abb82 100644 --- a/pkgs/development/libraries/libicns/default.nix +++ b/pkgs/development/libraries/libicns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, libpng, openjpeg }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, libpng, openjpeg }: stdenv.mkDerivation rec { pname = "libicns"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng openjpeg ]; NIX_CFLAGS_COMPILE = [ "-I${openjpeg.dev}/include/${openjpeg.incDir}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for manipulation of the Mac OS icns resource format"; homepage = "https://icns.sourceforge.io"; license = with licenses; [ gpl2 lgpl2 lgpl21 ]; diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index 9847312a34a..8cedd1bcb41 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, gperf}: +{lib, stdenv, fetchurl, zlib, gperf}: stdenv.mkDerivation rec { pname = "libid3tag"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { --subst-var-by version "${version}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ID3 tag manipulation library"; homepage = "http://mad.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index e936f3fd92a..afe5e550b33 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libiconv }: +{ fetchurl, lib, stdenv, libiconv }: stdenv.mkDerivation rec { name = "libidn-1.36"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.isDarwin libiconv; doCheck = false; # fails @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { ''; repositories.git = "git://git.savannah.gnu.org/libidn.git"; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.lgpl2Plus; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index c5af2d16bb2..30a33426639 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -1,11 +1,11 @@ -{ fetchurl, stdenv, libiconv, libunistring, help2man, buildPackages }: +{ fetchurl, lib, stdenv, libiconv, libunistring, help2man, buildPackages }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or # cgit) that are needed here should be included directly in Nixpkgs as # files. -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libidn2"; @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { ''; repositories.git = "https://gitlab.com/jas/libidn2"; - license = with stdenv.lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ]; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ fpletz ]; + license = with lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix index 2f2d2d190e8..911210202fe 100644 --- a/pkgs/development/libraries/libiec61883/default.nix +++ b/pkgs/development/libraries/libiec61883/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libraw1394 }: +{ lib, stdenv, fetchurl, pkg-config, libraw1394 }: stdenv.mkDerivation rec { version = "1.2.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libraw1394 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.linux1394.org"; license = licenses.lgpl21Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libieee1284/default.nix b/pkgs/development/libraries/libieee1284/default.nix index b5708a83a7d..7c20d1b4947 100644 --- a/pkgs/development/libraries/libieee1284/default.nix +++ b/pkgs/development/libraries/libieee1284/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl }: stdenv.mkDerivation rec { pname = "libieee1284"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ./bootstrap ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Parallel port communication library"; homepage = "http://cyberelk.net/tim/software/libieee1284/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 3c3ccf27884..043e27fb4b2 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { moveToOutput ${python.sitePackages} "$python" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "API for interfacing with the Linux Industrial I/O Subsystem"; homepage = "https://github.com/analogdevicesinc/libiio"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 2bca09be45f..83a5a462ee0 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libimagequant"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchShebangs ./configure ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pngquant.org/lib/"; description = "Image quantization library"; longDescription = "Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images."; diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index 476d2419ef3..b82a8b3fd35 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , cmake @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { fcitx5 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to support generic input method implementation"; homepage = "https://github.com/fcitx/libime"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index f5038e45d3a..b805be1257b 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config, gnutls +{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config, gnutls , libgcrypt, libtasn1, glib, libplist, libusbmuxd }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "--without-cython" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/libimobiledevice/libimobiledevice"; description = "A software library that talks the protocols to support iPhone®, iPod Touch® and iPad® devices on Linux"; longDescription = '' diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index b980e0a279f..e68d27cacff 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -1,6 +1,6 @@ { gtkWidgets ? false # build GTK widgets for libinfinity , avahiSupport ? false # build support for Avahi in libinfinity -, stdenv, fetchurl, pkg-config, glib, libxml2, gnutls, gsasl +, lib, stdenv, fetchurl, pkg-config, glib, libxml2, gnutls, gsasl , gobject-introspection , gtk3 ? null, gtk-doc, docbook_xsl, docbook_xml_dtd_412, avahi ? null, libdaemon, libidn, gss , libintl }: @@ -23,8 +23,8 @@ let nativeBuildInputs = [ pkg-config gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; buildInputs = [ glib libxml2 gsasl libidn gss libintl libdaemon ] - ++ stdenv.lib.optional gtkWidgets gtk3 - ++ stdenv.lib.optional avahiSupport avahi; + ++ lib.optional gtkWidgets gtk3 + ++ lib.optional avahiSupport avahi; propagatedBuildInputs = [ gnutls ]; @@ -39,15 +39,15 @@ let ]; passthru = { - infinoted = "${self.bin}/bin/infinoted-${stdenv.lib.versions.majorMinor version}"; + infinoted = "${self.bin}/bin/infinoted-${lib.versions.majorMinor version}"; }; meta = { homepage = "https://gobby.github.io/"; description = "An implementation of the Infinote protocol written in GObject-based C"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.phreedom ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.lgpl2Plus; + maintainers = [ lib.maintainers.phreedom ]; + platforms = with lib.platforms; linux ++ darwin; }; }; in self diff --git a/pkgs/development/libraries/libinjection/default.nix b/pkgs/development/libraries/libinjection/default.nix index b3bdbb41588..f678136637a 100644 --- a/pkgs/development/libraries/libinjection/default.nix +++ b/pkgs/development/libraries/libinjection/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , python }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # no binaries, so out = library, dev = headers outputs = [ "out" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SQL / SQLI tokenizer parser analyzer"; homepage = "https://github.com/client9/libinjection"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libinklevel/default.nix b/pkgs/development/libraries/libinklevel/default.nix index 90f6936d458..c5dc7987ca6 100644 --- a/pkgs/development/libraries/libinklevel/default.nix +++ b/pkgs/development/libraries/libinklevel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libusb1 }: +{ lib, stdenv, fetchurl, pkg-config, libusb1 }: stdenv.mkDerivation rec { pname = "libinklevel"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for checking the ink level of your printer"; longDescription = '' Libinklevel is a library for checking the ink level of your printer on a diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix index 074d2954ef1..ff74060d3d4 100644 --- a/pkgs/development/libraries/libinotify-kqueue/default.nix +++ b/pkgs/development/libraries/libinotify-kqueue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, autoreconfHook }: +{ lib, stdenv, fetchzip, autoreconfHook }: stdenv.mkDerivation rec { pname = "libinotify-kqueue"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = true; checkFlags = [ "test" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Inotify shim for macOS and BSD"; homepage = "https://github.com/libinotify-kqueue/libinotify-kqueue"; license = licenses.mit; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index cf0af9127f7..8f1511de330 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkg-config, meson, ninja +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja , libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support @@ -10,7 +10,7 @@ assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; assert testsSupport -> check != null && valgrind != null && python3 != null; let - mkFlag = optSet: flag: "-D${flag}=${stdenv.lib.boolToString optSet}"; + mkFlag = optSet: flag: "-D${flag}=${lib.boolToString optSet}"; sphinx-build = if documentationSupport then python3.pkgs.sphinx.overrideAttrs (super: { @@ -24,7 +24,7 @@ let else null; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libinput"; version = "1.16.4"; diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index f2b7eaa8f54..29d4c3432eb 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkg-config, gtk2, Carbon +{ config, lib, stdenv, fetchurl, pkg-config, gtk2, Carbon , useGTK ? config.libiodbc.gtk or false }: stdenv.mkDerivation rec { @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = stdenv.lib.optionals useGTK [ gtk2 ] - ++ stdenv.lib.optional stdenv.isDarwin Carbon; + buildInputs = lib.optionals useGTK [ gtk2 ] + ++ lib.optional stdenv.isDarwin Carbon; preBuild = '' export NIX_LDFLAGS_BEFORE="-rpath $out/lib" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "iODBC driver manager"; homepage = "http://www.iodbc.org"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix index 69918b5d36c..173bfafc8cc 100644 --- a/pkgs/development/libraries/libipfix/default.nix +++ b/pkgs/development/libraries/libipfix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { pname = "libipfix"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { url = "mirror://sourceforge/libipfix/files/libipfix/libipfix_110209.tgz"; sha256 = "0h7v0sxjjdc41hl5vq2x0yhyn04bczl11bqm97825mivrvfymhn6"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libipfix.sourceforge.net/"; description = "The libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix index e585a2b090f..272c61c47a5 100644 --- a/pkgs/development/libraries/libipt/default.nix +++ b/pkgs/development/libraries/libipt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "libipt"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Intel Processor Trace decoder library"; homepage = "https://github.com/intel/libipt"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix index 01b23d9e2d2..140faab43b1 100644 --- a/pkgs/development/libraries/libiptcdata/default.nix +++ b/pkgs/development/libraries/libiptcdata/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "libiptcdata-1.0.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for reading and writing the IPTC metadata in images and other files"; homepage = "http://libiptcdata.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix index 4bef2de28c0..56a9f1b961c 100644 --- a/pkgs/development/libraries/libircclient/default.nix +++ b/pkgs/development/libraries/libircclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "1.10"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --replace "cp " "install " ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A small but extremely powerful library which implements the client IRC protocol"; homepage = "http://www.ulduzsoft.com/libircclient/"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix index 26a39516d25..6a2f926d79e 100644 --- a/pkgs/development/libraries/libirecovery/default.nix +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config +{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config , libusb1 , readline }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''--with-udevrule="OWNER=\"root\", GROUP=\"myusergroup\", MODE=\"0660\""'' ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/libimobiledevice/libirecovery"; description = "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux"; longDescription = '' diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/development/libraries/libiscsi/default.nix index 246696c94eb..adc721bc6d0 100644 --- a/pkgs/development/libraries/libiscsi/default.nix +++ b/pkgs/development/libraries/libiscsi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libiscsi"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # This problem is gone on libiscsi master. NIX_CFLAGS_COMPILE = if stdenv.hostPlatform.is32bit then "-Wno-error=sign-compare" else null; - meta = with stdenv.lib; { + meta = with lib; { description = "iscsi client library and utilities"; homepage = "https://github.com/sahlberg/libiscsi"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/libisds/default.nix b/pkgs/development/libraries/libisds/default.nix index 28a8d7d874b..268acb2f948 100644 --- a/pkgs/development/libraries/libisds/default.nix +++ b/pkgs/development/libraries/libisds/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , expat , gpgme @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat gpgme libgcrypt libxml2 libxslt curl docbook_xsl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system"; homepage = "http://xpisar.wz.cz/libisds/"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix index 0b4984fc82a..1e2ae41f3f2 100644 --- a/pkgs/development/libraries/libisoburn/default.nix +++ b/pkgs/development/libraries/libisoburn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }: +{ lib, stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }: stdenv.mkDerivation rec { pname = "libisoburn"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ attr zlib libburn libisofs ]; propagatedBuildInputs = [ acl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libburnia-project.org/"; description = "Enables creation and expansion of ISO-9660 filesystems on CD/DVD/BD "; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index 0c01389f0b8..a291410941c 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, acl, attr, zlib }: +{ lib, stdenv, fetchurl, acl, attr, zlib }: stdenv.mkDerivation rec { pname = "libisofs"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ attr zlib ]; propagatedBuildInputs = [ acl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libburnia-project.org/"; description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 4d9df889851..c57876e9c4f 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libconfuse }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libconfuse }: stdenv.mkDerivation rec { pname = "libite"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libconfuse ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Lightweight library of frog DNA"; longDescription = '' diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index 2dc009b9b1c..9a1c728bd55 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkg-config, file, protobufc }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, file, protobufc }: stdenv.mkDerivation rec { pname = "libivykis"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ file protobufc ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libivykis.sourceforge.net/"; description = '' A thin wrapper over various OS'es implementation of I/O readiness diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix index e971136b088..489f526248a 100644 --- a/pkgs/development/libraries/libixp-hg/default.nix +++ b/pkgs/development/libraries/libixp-hg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, txt2tags }: +{ lib, stdenv, fetchurl, unzip, txt2tags }: stdenv.mkDerivation rec { rev = "148"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://repo.cat-v.org/libixp/"; # see also https://libs.suckless.org/deprecated/libixp description = "Portable, simple C-language 9P client and server libary"; - maintainers = with stdenv.lib.maintainers; [ kovirobi ]; - license = stdenv.lib.licenses.mit; + maintainers = with lib.maintainers; [ kovirobi ]; + license = lib.licenses.mit; inherit version; - platforms = with stdenv.lib.platforms; unix; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index a6ad6d4bb64..974f1f6674f 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , docbook_xml_dtd_43 , docbook-xsl-nons @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for reading and writing Jcat files"; homepage = "https://github.com/hughsie/libjcat"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index c4e81d034fc..5fe1c2ee9ec 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, nasm +{ lib, stdenv, fetchFromGitHub, cmake, nasm , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; patches = - stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") + lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") ./mingw-boolean.patch; outputs = [ "bin" "dev" "out" "man" "doc" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libjpeg-turbo.org/"; description = "A faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 05fbb7de701..f462d9824a4 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, static ? false }: +{ lib, stdenv, fetchurl, static ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "libjpeg-9d"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.ijg.org/"; description = "A library that implements the JPEG image file format"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.free; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix index 2c14d270f26..5a70e4b01dd 100644 --- a/pkgs/development/libraries/libjreen/default.nix +++ b/pkgs/development/libraries/libjreen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, pkg-config, gsasl }: +{ lib, stdenv, fetchurl, cmake, qt4, pkg-config, gsasl }: stdenv.mkDerivation rec { pname = "libjreen"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ Jabber library using Qt framework"; homepage = "https://qutim.org/jreen/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index aa23b3f8eaf..e2dd30fc616 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , pkg-config @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { preInstall = '' function fixRunPath { p=$(patchelf --print-rpath $1) - q="$p:${stdenv.lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ]}:$out/lib" + q="$p:${lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ]}:$out/lib" patchelf --set-rpath $q $1 } @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ framework for json-rpc (json remote procedure call)"; homepage = "https://github.com/cinemast/libjson-rpc-cpp"; license = licenses.mit; diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index 1d6fb1e7289..42d723b3b1b 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let version = "7.6.1"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ in stdenv.mkDerivation { makeFlags = [ "prefix=$(out)" ]; preInstall = "mkdir -p $out/lib"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libjson.sourceforge.net/"; description = "A JSON reader and writer"; longDescription = '' diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix index a999f813fbb..2135cc37d91 100644 --- a/pkgs/development/libraries/libkate/default.nix +++ b/pkgs/development/libraries/libkate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libogg, libpng }: +{ lib, stdenv, fetchurl, libogg, libpng }: stdenv.mkDerivation rec { name = "libkate-0.4.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libogg libpng ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for encoding and decoding Kate streams"; longDescription = '' This is libkate, the reference implementation of a codec for the Kate diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index b6aa19c442a..d2aecccdedf 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, qtbase, qmake }: +{ lib, stdenv, fetchFromGitHub, fftw, qtbase, qmake }: stdenv.mkDerivation rec { pname = "libkeyfinder"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cp -a lib*.so* $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Musical key detection for digital audio (C++ library)"; homepage = "http://www.ibrahimshaath.co.uk/keyfinder/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libkml/default.nix b/pkgs/development/libraries/libkml/default.nix index 690d9b9801c..0e2ab21ee79 100644 --- a/pkgs/development/libraries/libkml/default.nix +++ b/pkgs/development/libraries/libkml/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , boost @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTING=ON" # Darwin tests require rpath for libs in build dir - ] ++ stdenv.lib.optional stdenv.isDarwin [ + ] ++ lib.optional stdenv.isDarwin [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Reference implementation of OGC KML 2.2"; homepage = "https://github.com/libkml/libkml"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 7e14c1b533b..e623aa0d111 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,4 +1,4 @@ -{ buildPackages, stdenv, fetchurl, gettext, libgpgerror }: +{ buildPackages, lib, stdenv, fetchurl, gettext, libgpgerror }: stdenv.mkDerivation rec { name = "libksba-1.5.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { rmdir --ignore-fail-on-non-empty $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnupg.org"; description = "CMS and X.509 access library"; platforms = platforms.all; diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix index 2701cc51359..01512181171 100644 --- a/pkgs/development/libraries/libksi/default.nix +++ b/pkgs/development/libraries/libksi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }: stdenv.mkDerivation rec { pname = "libksi"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--with-cafile=/etc/ssl/certs/ca-certificates.crt" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/GuardTime/libksi"; description = "Keyless Signature Infrastructure API library"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index 9aea99f6a40..610efa7ed4f 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, extra-cmake-modules +{ lib, stdenv, fetchurl, cmake, extra-cmake-modules , karchive, kcrash, ki18n, kio, solid , boost, gmp, qca-qt5, libgcrypt }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { inherit mainVersion; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A BitTorrent library used by KTorrent"; homepage = "https://www.kde.org/applications/internet/ktorrent/"; maintainers = with maintainers; [ eelco ]; diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 30342ea24c8..0198888f2b5 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext +{ lib, stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext , pkg-config, glib, libxml2, gobject-introspection, gnome-common, unzip }: @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "An interface library to access tags for identifying languages"; - license = stdenv.lib.licenses.mpl20; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mpl20; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; # There are links to a homepage that are broken by a BitBucket change homepage = "https://bitbucket.org/tagoh/liblangtag/overview"; }; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 2bf33bab416..10cdb301479 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, cmake +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, cmake , fftwSinglePrec, libsamplerate, qtbase , darwin }: @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config which cmake ]; buildInputs = [ fftwSinglePrec libsamplerate qtbase ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/lastfm/liblastfm"; repositories.git = "git://github.com/lastfm/liblastfm.git"; description = "Official LastFM library"; diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index 4bf8fb7bf65..fe3038c3249 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, curl, openssl }: +{ lib, stdenv, fetchurl, pkg-config, curl, openssl }: stdenv.mkDerivation { name = "liblastfm-SF-0.5"; @@ -15,6 +15,6 @@ stdenv.mkDerivation { meta = { homepage = "http://liblastfm.sourceforge.net"; description = "Unofficial C lastfm library"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix index ef50c106eae..9464714d5cc 100644 --- a/pkgs/development/libraries/liblaxjson/default.nix +++ b/pkgs/development/libraries/liblaxjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { version = "1.0.5"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for parsing JSON config files"; homepage = "https://github.com/andrewrk/liblaxjson"; license = licenses.mit; diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index 3783bd408f1..2c7f0989282 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, expat, icu }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, expat, icu }: stdenv.mkDerivation rec { pname = "liblcf"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ expat icu ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects"; homepage = "https://github.com/EasyRPG/liblcf"; license = licenses.mit; diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index 67eb8748f16..3989cc59e4d 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fixDarwinDylibNames }: +{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames }: let soVersion = "4"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; - nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; buildFlags = [ "lib" "predict" "train" ]; @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { install -Dm444 -t $dev/include linear.h ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for large linear classification"; homepage = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 5c06dea390f..f56e6a9a5c7 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -40,7 +40,7 @@ , soci , speex , sqlite -, stdenv +, lib, stdenv , udev , xercesc , xsd @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { ln -s ${belcard}/share/belr/grammars/* $out/share/belr/grammars/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.linphone.org/technical-corner/liblinphone"; description = "Library for SIP calls and instant messaging"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index a25666dfcf2..5f5b23cdc3a 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "liblo-0.31"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol"; homepage = "https://sourceforge.net/projects/liblo"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.marcweber]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix index 6ed995572ef..a2587702bb3 100644 --- a/pkgs/development/libraries/liblockfile/default.nix +++ b/pkgs/development/libraries/liblockfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { _name = "liblockfile"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = { description = "Shared library with NFS-safe locking functions"; homepage = "http://packages.debian.org/unstable/libs/liblockfile1"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.bluescreen303 ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index 5602231e34d..4a28bf67741 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, pkg-config , systemd ? null }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "--enable-man-pages" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.liblogging.org/"; description = "Lightweight signal-safe logging library"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index d3a6b599742..293f72d67b2 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libestr, json_c, pcre, fastJson }: +{ lib, stdenv, fetchurl, pkg-config, libestr, json_c, pcre, fastJson }: stdenv.mkDerivation rec { name = "liblognorm-2.0.6"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-regexp" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.liblognorm.com/"; description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 3e83e34ee81..1dec830566f 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, stdenv +, lib, stdenv , autoreconfHook , pkg-config , gettext @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Open-source braille translator and back-translator"; homepage = "http://liblouis.org/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index 936469c01c6..b871dbdb19d 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, glib }: +{ lib, stdenv, fetchurl, pkg-config, glib }: stdenv.mkDerivation rec { name = "liblqr-1-0.4.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ glib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://liblqr.wikidot.com"; description = "Seam-carving C/C++ library called Liquid Rescaling"; platforms = platforms.all; diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index 4ee37dc0b9f..dcb862f2cd4 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkg-config }: +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config }: stdenv.mkDerivation rec { pname = "liblscp"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.linuxsampler.org"; description = "LinuxSampler Control Protocol (LSCP) wrapper library"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/development/libraries/libltc/default.nix index 4513396d7ea..2391d281d46 100644 --- a/pkgs/development/libraries/libltc/default.nix +++ b/pkgs/development/libraries/libltc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "libltc-1.3.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "173h9dgmain3nyrwk6q2d7yl4fnh4vacag4s2p01n5b7nyrkxrjh"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://x42.github.io/libltc/"; description = "POSIX-C Library for handling Linear/Logitudinal Time Code (LTC)"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/development/libraries/liblxi/default.nix index ebb8cbe0376..1ca4043a024 100644 --- a/pkgs/development/libraries/liblxi/default.nix +++ b/pkgs/development/libraries/liblxi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkg-config, autoreconfHook , libtirpc, rpcsvc-proto, avahi, libxml2 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtirpc avahi libxml2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for communicating with LXI compatible instruments"; longDescription = '' liblxi is an open source software library which offers a simple diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 84800f309fb..dd792348686 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoconf }: +{ lib, stdenv, fetchurl, fetchpatch, autoconf }: stdenv.mkDerivation rec { pname = "libmad"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # optimize.diff is taken from https://projects.archlinux.org/svntogit/packages.git/tree/trunk/optimize.diff?h=packages/libmad # It is included here in order to fix a build failure in Clang # But it may be useful to fix other, currently unknown problems as well - ++ stdenv.lib.optionals stdenv.cc.isClang [ + ++ lib.optionals stdenv.cc.isClang [ (fetchpatch { url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/optimize.diff"; sha256 = "0hcxzz9ql1fizyqbsgdchdwi7bvchfr72172j43hpyj53p0yabc6"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { preConfigure = "autoconf"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/mad/"; description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 96593fb50bf..76dd4eb20c1 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , ninja , meson @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1b3bcdkk5xd5asq797cch9id8692grsjxrc1ss87vv11m1ck4rb3"; }; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple GObject game controller library"; homepage = "https://gnome.pages.gitlab.gnome.org/libmanette/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index 49769359ed3..50b66eccfb3 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}: +{ lib, stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}: stdenv.mkDerivation rec { pname = "libmatchbox"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Library of the matchbox X window manager"; homepage = "http://matchbox-project.org/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index b794c1f7217..b0fe1c35ef3 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, guile, autoconf, flex, fetchpatch }: +{ lib, stdenv, fetchurl, pkg-config, guile, autoconf, flex, fetchpatch }: stdenv.mkDerivation rec { version = "1.1.11"; @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { symbolic derivatives and output expressions to strings. ''; homepage = "https://www.gnu.org/software/libmatheval/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.bzizou ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index ab8107b39c4..1d3cf4032dd 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , libebml }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=YES" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to parse Matroska files"; homepage = "https://matroska.org/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index 2b4d75bba75..078865198a4 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libmaxminddb"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-fFbnkf8qZVIV5+04ZLH/3X00o4g1d57+1WpC8Fa9WKo="; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C library for working with MaxMind geolocation DB files"; homepage = "https://github.com/maxmind/libmaxminddb"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index fdf724c09fd..850c7aa1df0 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , gobject-introspection @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/libmbim/"; description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index 59498170a1d..44c55cb4682 100644 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ b/pkgs/development/libraries/libmcrypt/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, darwin, disablePosixThreads ? false }: +{ lib, stdenv, fetchurl, darwin, disablePosixThreads ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "libmcrypt-2.5.8"; diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index e3dd0b206f1..7093376aa7e 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "libmd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.hadrons.org/software/${pname}/"; changelog = "https://archive.hadrons.org/software/libmd/libmd-${version}.announce"; # Git: https://git.hadrons.org/cgit/libmd.git diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index 1007123619f..28c8ae6db94 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }: stdenv.mkDerivation rec { pname = "libmediaart"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library tasked with managing, extracting and handling media art caches"; maintainers = teams.gnome.members; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 0974371c41e..d78ccbc50ab 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: stdenv.mkDerivation rec { version = "20.09"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -vD -m 644 libmediainfo.pc "$out/lib/pkgconfig/libmediainfo.pc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Shared library for mediainfo"; homepage = "https://mediaarea.net/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 8cbb76377fb..0ee0701d929 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }: +{ lib, stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }: stdenv.mkDerivation { name = "libmemcached-1.0.18"; @@ -13,19 +13,19 @@ stdenv.mkDerivation { # https://bugs.launchpad.net/libmemcached/+bug/1281907 # Fix building on macOS (patch from Homebrew) # https://bugs.launchpad.net/libmemcached/+bug/1245562 - patches = stdenv.lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch - ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { + patches = lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch + ++ lib.optional stdenv.isDarwin (fetchpatch { url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb"; sha256 = "1gjf3vd7hiyzxjvlg2zfc3y2j0lyr6nhbws4xb5dmin3csyp8qb8"; }) - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch; + ++ lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch; buildInputs = [ libevent ]; propagatedBuildInputs = [ cyrus_sasl ]; NIX_CFLAGS_COMPILE = "-fpermissive"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libmemcached.org"; description = "Open source C/C++ client library and tools for the memcached server"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix index 54ff0dccb90..128975246a8 100644 --- a/pkgs/development/libraries/libmesode/default.nix +++ b/pkgs/development/libraries/libmesode/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , libtool @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Fork of libstrophe (https://github.com/strophe/libstrophe) for use with Profanity XMPP Client"; longDescription = '' Reasons for forking: diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/development/libraries/libmhash/default.nix index 2a61c571066..f569ce7fac7 100644 --- a/pkgs/development/libraries/libmhash/default.nix +++ b/pkgs/development/libraries/libmhash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mhash"; @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; homepage = "http://mhash.sourceforge.net"; license = "LGPL"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/pkgs/development/libraries/libmicrodns/default.nix index 5bed556a273..c9dd899a2b0 100644 --- a/pkgs/development/libraries/libmicrodns/default.nix +++ b/pkgs/development/libraries/libmicrodns/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimal mDNS resolver library, used by VLC"; homepage = "https://github.com/videolabs/libmicrodns"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libmicrohttpd/generic.nix b/pkgs/development/libraries/libmicrohttpd/generic.nix index 99407d22b75..336b66ac832 100644 --- a/pkgs/development/libraries/libmicrohttpd/generic.nix +++ b/pkgs/development/libraries/libmicrohttpd/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src }: +{ lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src }: stdenv.mkDerivation rec { pname = "libmicrohttpd"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Disabled because the tests can time-out. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Embeddable HTTP server library"; longDescription = '' diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index 59967bcba5a..a734a4b8009 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, texinfo, alsaLib, libpulseaudio, CoreAudio }: +{ lib, stdenv, fetchurl, texinfo, alsaLib, libpulseaudio, CoreAudio }: let - inherit (stdenv.lib) optional optionalString; + inherit (lib) optional optionalString; in stdenv.mkDerivation rec { name = "libmikmod-3.3.11.1"; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = optionalString stdenv.isLinux "-lasound"; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for playing tracker music module files"; homepage = "https://mikmod.shlomifish.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index f937d818a55..9287b0a0dea 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4 }: +{ lib, stdenv, fetchurl, m4 }: stdenv.mkDerivation rec { pname = "libmilter"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ m4 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Sendmail Milter mail filtering API library"; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix index ce39285e0d2..2440082cce9 100644 --- a/pkgs/development/libraries/libminc/default.nix +++ b/pkgs/development/libraries/libminc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, netcdf, nifticlib, hdf5 }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib, netcdf, nifticlib, hdf5 }: stdenv.mkDerivation rec { pname = "libminc"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # ezminc_rw_test: can't find libminc_io.so.5.2.0 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BIC-MNI/libminc"; description = "Medical imaging library based on HDF5"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix index 9a754eda592..584d76e1cf2 100644 --- a/pkgs/development/libraries/libmkv/default.nix +++ b/pkgs/development/libraries/libmkv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libtool, autoconf, automake }: +{ lib, stdenv, fetchFromGitHub, libtool, autoconf, automake }: stdenv.mkDerivation rec { pname = "libmkv"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { It is written in plain C, and intended to be very portable. ''; homepage = "https://github.com/saintdev/libmkv"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.wmertens ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.wmertens ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix index a56b18fe199..83add1d42a5 100644 --- a/pkgs/development/libraries/libmms/default.nix +++ b/pkgs/development/libraries/libmms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkg-config }: +{ lib, stdenv, fetchurl, glib, pkg-config }: stdenv.mkDerivation rec { name = "libmms-0.6.4"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for downloading (streaming) media files using the mmst and mmsh protocols"; homepage = "http://libmms.sourceforge.net"; platforms = platforms.all; diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index e13bda56793..f1704a527b4 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }: +{ lib, stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }: stdenv.mkDerivation rec { name = "libmng-2.0.3"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib libpng libjpeg lcms2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; homepage = "http://www.libmng.com"; license = licenses.zlib; diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index 3db6ab0da08..4e99258a3e8 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libmnl-1.0.4"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { re-inventing the wheel. ''; homepage = "https://netfilter.org/projects/libmnl/index.html"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix index 14f80e9b2e5..b311c4f0418 100644 --- a/pkgs/development/libraries/libmodbus/default.nix +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libmodbus-3.1.6"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "ac_cv_func_realloc_0_nonnull=yes" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to send/receive data according to the Modbus protocol"; homepage = "https://libmodbus.org/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix index 2d38a5021e5..790674f1649 100644 --- a/pkgs/development/libraries/libmodplug/default.nix +++ b/pkgs/development/libraries/libmodplug/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file }: +{ lib, stdenv, fetchurl, file }: let version = "0.8.9.0"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { --replace /usr/bin/file ${file}/bin/file ''; - meta = with stdenv.lib; { + meta = with lib; { description = "MOD playing library"; homepage = "http://modplug-xmms.sourceforge.net/"; license = licenses.publicDomain; diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/development/libraries/libmodule/default.nix index 2848298016d..d77d2bcbdcd 100644 --- a/pkgs/development/libraries/libmodule/default.nix +++ b/pkgs/development/libraries/libmodule/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, pkg-config }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C simple and elegant implementation of an actor library"; homepage = "https://github.com/FedeDP/libmodule"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix index a0d32f5178a..8a8d9adf53d 100644 --- a/pkgs/development/libraries/libmodulemd/default.nix +++ b/pkgs/development/libraries/libmodulemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , substituteAll , fetchFromGitHub , fetchpatch @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { echo "$out ${python3.pkgs.pygobject3} ${python3.pkgs.six}" > "$py/nix-support/propagated-build-inputs" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C Library for manipulating module metadata files"; homepage = "https://github.com/fedora-modularity/libmodulemd"; license = licenses.mit; diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix index f07dbd84a95..f81f6313338 100644 --- a/pkgs/development/libraries/libmongo-client/default.nix +++ b/pkgs/development/libraries/libmongo-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib }: stdenv.mkDerivation rec { name = "libmongo-client-0.1.8"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -i 's/Requires.private/Requires/g' src/libmongo-client.pc.in ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://algernon.github.io/libmongo-client/"; description = "An alternative C driver for MongoDB"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix index ae3a9efef24..e227c09b2b6 100644 --- a/pkgs/development/libraries/libmowgli/default.nix +++ b/pkgs/development/libraries/libmowgli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libmowgli"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0xx4vndmwz40pxa5gikl8z8cskpdl9a30i2i5fjncqzlp4pspymp"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A development framework for C providing high performance and highly flexible algorithms"; homepage = "https://github.com/atheme/libmowgli-2"; license = licenses.isc; diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix index 237e3f94cfc..58da7560e13 100644 --- a/pkgs/development/libraries/libmp3splt/default.nix +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, libmad, libid3tag }: +{ lib, stdenv, fetchurl, libtool, libmad, libid3tag }: stdenv.mkDerivation rec { name = "libmp3splt-0.9.2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-pcre" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/mp3splt/"; description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; maintainers = with maintainers; [ bosu ]; diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix index 736474d29a5..b62da40499c 100644 --- a/pkgs/development/libraries/libmpack/default.nix +++ b/pkgs/development/libraries/libmpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libtool }: +{ lib, stdenv, fetchFromGitHub, libtool }: stdenv.mkDerivation rec { pname = "libmpack"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "LIBTOOL=libtool" "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple implementation of msgpack in C"; homepage = "https://github.com/tarruda/libmpack/"; license = licenses.mit; diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 79fa1743781..66e38fbfbc0 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , gmp, mpfr }: @@ -33,9 +33,9 @@ stdenv.mkDerivation { ''; homepage = "http://mpc.multiprecision.org/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix index 3ee37e6ae9c..b42d9a3d1e4 100644 --- a/pkgs/development/libraries/libmpcdec/default.nix +++ b/pkgs/development/libraries/libmpcdec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "libmpcdec-1.2.6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { description = "Musepack SV7 decoder library"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.bsd3; + platforms = lib.platforms.unix; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index d6fb28c0e88..bf5f25ca43f 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "0.5.1"; @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { }; # Otherwise clang fails with 'duplicate symbol ___sputc' - buildFlags = stdenv.lib.optional stdenv.isDarwin "CFLAGS=-std=gnu89"; + buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-std=gnu89"; meta = { homepage = "http://libmpeg2.sourceforge.net/"; description = "A free library for decoding mpeg-2 and mpeg-1 video streams"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index fbd7cbe7ad6..df3460970d1 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, curl, libnxml, pkg-config}: +{lib, stdenv, fetchurl, curl, libnxml, pkg-config}: stdenv.mkDerivation { name = "libmrss-0.19.2"; @@ -14,9 +14,9 @@ stdenv.mkDerivation { meta = { homepage = "http://www.autistici.org/bakunin/libmrss/doc"; description = "C library for parsing, writing and creating RSS/ATOM files or streams"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.viric ]; }; } diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index 70fdd7e913e..4ad60bcfb18 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "libmspack-0.7.1alpha"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "A de/compression library for various Microsoft formats"; homepage = "https://www.cabextract.org.uk/libmspack"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index bbc3e949053..a49026c35dc 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkg-config +{ lib, stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkg-config , libusb1 , libiconv }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # tried to install files to /lib/udev, hopefully OK configureFlags = [ "--with-udev=$$bin/lib/udev" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libmtp.sourceforge.net"; description = "An implementation of Microsoft's Media Transfer Protocol"; longDescription = '' diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix index 7c8cdd1df1a..3e7a2f1a0ba 100644 --- a/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, neon, libdiscid, libxml2, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, neon, libdiscid, libxml2, pkg-config }: stdenv.mkDerivation rec { version = "5.1.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { dontUseCmakeBuildDir=true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://musicbrainz.org/doc/libmusicbrainz"; description = "MusicBrainz Client Library (5.x version)"; longDescription = '' diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index d5568cdb3d6..ab67d544a1d 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, neon, libdiscid }: +{ lib, stdenv, fetchurl, cmake, neon, libdiscid }: stdenv.mkDerivation rec { name = "libmusicbrainz-3.0.3"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://musicbrainz.org/doc/libmusicbrainz"; description = "MusicBrainz Client Library (3.x version)"; longDescription = '' diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index 1889fc1508f..0c56964bfed 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}: +{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}: let s = # Generated upstream information rec { @@ -24,8 +24,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''Import library for some old mac text documents''; - license = stdenv.lib.licenses.mpl20 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mpl20 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index ace5503b657..f4256de6981 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , libtool, pkg-config, automake, autoconf, intltool , glib, gobject-introspection, gtk2, gtk-doc , clutter, clutter-gtk @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { sed -i 's/GLfloat/gfloat/g' mx/mx-texture-frame.c ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.clutter-project.org/"; description = "A Clutter-based toolkit"; longDescription = diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index d3e0ff53528..655480f75a2 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoconf , automake , fetchFromGitHub @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mypaint.org/"; description = "Library for making brushstrokes which is used by MyPaint and other projects"; license = licenses.isc; diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 6c4874112b7..4c00d642588 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , boost @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dev.mysql.com/downloads/connector/cpp/"; description = "C++ library for connecting to mysql servers"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix index 91843163176..af5e78c25d6 100644 --- a/pkgs/development/libraries/libnabo/default.nix +++ b/pkgs/development/libraries/libnabo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake, eigen, boost}: +{lib, stdenv, fetchFromGitHub, cmake, eigen, boost}: stdenv.mkDerivation rec { version = "1.0.7"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A fast K Nearest Neighbor library for low-dimensional spaces"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix index a2aae126359..dd902c0021d 100644 --- a/pkgs/development/libraries/libnatpmp/default.nix +++ b/pkgs/development/libraries/libnatpmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libnatpmp"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLPREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://miniupnp.free.fr/libnatpmp.html"; description = "NAT-PMP client"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index 12f1038f8e1..3d1e2b7ac4a 100644 --- a/pkgs/development/libraries/libnats-c/default.nix +++ b/pkgs/development/libraries/libnats-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, protobuf, protobufc , libsodium, openssl }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { separateDebugInfo = true; outputs = [ "out" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C API for the NATS messaging system"; homepage = "https://github.com/nats-io/nats.c"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index 8ac2859faed..17e43ec29d9 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, popt, libiconv }: +{ lib, stdenv, fetchurl, autoreconfHook, popt, libiconv }: stdenv.mkDerivation (rec { name = "libnatspec-0.3.0"; @@ -12,12 +12,12 @@ stdenv.mkDerivation (rec { buildInputs = [ popt ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://natspec.sourceforge.net/"; description = "A library intended to smooth national specificities in using of programs"; platforms = platforms.unix; license = licenses.lgpl21; }; -} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { +} // lib.optionalAttrs (!stdenv.isLinux) { propagatedBuildInputs = [ libiconv ]; }) diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index aac9f8e8acf..b7e082f2b9b 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , asciidoctor, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , json_c, kmod, which, util-linux, udev, keyutils }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { echo "m4_define([GIT_VERSION], [${version}])" > version.m4; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for managing the Linux Non-Volatile Memory Device sub-system"; homepage = "https://github.com/pmem/ndctl"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/development/libraries/libndp/default.nix index 2592b7184f8..fc68149c14c 100644 --- a/pkgs/development/libraries/libndp/default.nix +++ b/pkgs/development/libraries/libndp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libndp-1.7"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1dlinhl39va00v55qygjc9ap77yqf7xvn4rwmvdr49xhzzxhlj1c"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libndp.org/"; description = "Library for Neighbor Discovery Protocol"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index d27c1ba376d..1f0709af6cf 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Dynamic types for data description and in-memory computations"; homepage = "https://xnd.io/"; license = licenses.bsdOriginal; diff --git a/pkgs/development/libraries/libnest2d/default.nix b/pkgs/development/libraries/libnest2d/default.nix index ee61ef8a723..567598500d6 100644 --- a/pkgs/development/libraries/libnest2d/default.nix +++ b/pkgs/development/libraries/libnest2d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }: +{ lib, stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }: stdenv.mkDerivation rec { version = "2020-10-09-unstable"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { CLIPPER_PATH = "${clipper.out}"; cmakeFlags = [ "-DLIBNEST2D_HEADER_ONLY=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "2D irregular bin packaging and nesting library written in modern C++"; homepage = "https://github.com/Ultimaker/libnest2d"; diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index 7987fccc06f..cb3375708df 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libnet"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-includes.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sam-github/libnet"; description = "Portable framework for low-level network packet construction"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix index 98d89d67ef6..72766471d2f 100644 --- a/pkgs/development/libraries/libnetfilter_acct/default.nix +++ b/pkgs/development/libraries/libnetfilter_acct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libmnl }: +{ lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { version = "1.0.3"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.netfilter.org/projects/libnetfilter_acct/"; description = "Userspace library providing interface to extended accounting infrastructure"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index a97e77c5334..a2097bb17e2 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }: +{ lib, stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_conntrack"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libnfnetlink ]; nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Userspace library providing an API to the in-kernel connection tracking state table"; longDescription = '' libnetfilter_conntrack is a userspace library providing a programming interface (API) to the diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index b700c0e9d9a..b8b05e57dad 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libmnl }: +{ lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_cthelper"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { is used by conntrack-tools. ''; homepage = "http://www.netfilter.org/projects/libnetfilter_cthelper/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix index 23de6481592..a8d0c2680df 100644 --- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libmnl }: +{ lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_cttimeout"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { be attached to traffic flows. This library is used by conntrack-tools. ''; homepage = "https://netfilter.org/projects/libnetfilter_cttimeout/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix index 9bec269e6ac..4ac20cf29cb 100644 --- a/pkgs/development/libraries/libnetfilter_log/default.nix +++ b/pkgs/development/libraries/libnetfilter_log/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }: +{ lib, stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_log"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libnfnetlink ]; nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Userspace library providing interface to packets that have been logged by the kernel packet filter"; longDescription = '' libnetfilter_log is a userspace library providing interface to packets diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 6889f7702e6..7dafcd42223 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libmnl, libnfnetlink }: +{ lib, stdenv, fetchurl, pkg-config, libmnl, libnfnetlink }: stdenv.mkDerivation rec { version = "1.0.5"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl libnfnetlink ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.netfilter.org/projects/libnetfilter_queue/"; description = "Userspace API to packets queued by the kernel packet filter"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index ed7412d6611..b4daab97388 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb-compat-0_1, readline }: +{ lib, stdenv, fetchurl, libusb-compat-0_1, readline }: stdenv.mkDerivation { pname = "libnfc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ libusb-compat-0_1 readline ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source library libnfc for Near Field Communication"; license = licenses.gpl3; homepage = "https://github.com/nfc-tools/libnfc"; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index ecce38ac23e..4c7b4a5cc2d 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libnfnetlink-1.0.1"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { It is only used by other netfilter.org projects, like the aforementioned ones. ''; homepage = "http://www.netfilter.org/projects/libnfnetlink/index.html"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix index 03a4dbe02d5..4e12553b00b 100644 --- a/pkgs/development/libraries/libnfs/default.nix +++ b/pkgs/development/libraries/libnfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libnfs"; @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=tautological-compare"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=tautological-compare"; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "NFS client library"; homepage = "https://github.com/sahlberg/libnfs"; license = with licenses; [ lgpl2 bsd2 gpl3 ]; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index a546eeebdc5..025ddf8e7b1 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libmnl }: +{ lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { version = "1.1.8"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem"; homepage = "http://netfilter.org/projects/libnftnl"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index 84bd9b33e79..72fbcd1ab08 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, bison, flex, fftw}: +{lib, stdenv, fetchurl, bison, flex, fftw}: # Note that this does not provide the ngspice command-line utility. For that see # the ngspice derivation. @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ngshared" "--enable-xspice" "--enable-cider" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; homepage = "http://ngspice.sourceforge.net"; license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index b4e1682ab7e..7c5043165f9 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , meson @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { # see https://github.com/NixOS/nixpkgs/pull/53293#issuecomment-453739295 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "GLib ICE implementation"; longDescription = '' Libnice is an implementation of the IETF's Interactice Connectivity diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index 497e3aa6679..fbe01bf4062 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, dbus, expat }: +{ lib, stdenv, fetchurl, pkg-config, dbus, expat }: let version = "1.0.3"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A small library for C application development"; homepage = "https://launchpad.net/libnih"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix index f1661f222cc..abbffcf0f94 100644 --- a/pkgs/development/libraries/libnixxml/default.nix +++ b/pkgs/development/libraries/libnixxml/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }: +{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }: stdenv.mkDerivation { name = "libnixxml"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ./bootstrap ''; - meta = with stdenv.lib; { + meta = with lib; { description = "XML-based Nix-friendly data integration library"; homepage = https://github.com/svanderburg/libnixxml; license = licenses.mit; diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index 2675098a826..29b37164228 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36"; }; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developer.gnome.org/notification-spec/"; description = "A library that sends desktop notifications to a notification daemon"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index 8cdbdbd747a..f6a8d01ab84 100644 --- a/pkgs/development/libraries/libnova/default.nix +++ b/pkgs/development/libraries/libnova/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook }: +{ lib, stdenv, fetchgit, autoreconfHook }: stdenv.mkDerivation rec { pname = "libnova"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Celestial Mechanics, Astrometry and Astrodynamics Library"; homepage = "http://libnova.sf.net"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix index ab7527c7c76..ac4c6bf9ad3 100644 --- a/pkgs/development/libraries/libnsl/default.nix +++ b/pkgs/development/libraries/libnsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkg-config }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkg-config }: stdenv.mkDerivation rec { pname = "libnsl"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libtirpc ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Client interface library for NIS(YP) and NIS+"; homepage = "https://github.com/thkukuk/libnsl"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libnxml/default.nix b/pkgs/development/libraries/libnxml/default.nix index dc5e8dfc55e..84617001143 100644 --- a/pkgs/development/libraries/libnxml/default.nix +++ b/pkgs/development/libraries/libnxml/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, curl}: +{lib, stdenv, fetchurl, curl}: stdenv.mkDerivation { name = "libnxml-0.18.3"; @@ -13,9 +13,9 @@ stdenv.mkDerivation { meta = { homepage = "https://www.autistici.org/bakunin/libnxml/"; description = "C library for parsing, writing and creating XML 1.0 and 1.1 files or streams"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.viric ]; }; } diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index 8980a145dc9..caab0a83fcf 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, nss, nspr, pkg-config }: +{ fetchurl, lib, stdenv, nss, nspr, pkg-config }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --replace "-lnss3" "-L${nss.out}/lib -lnss3" ''; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; description = "C library implementing the OAuth secure authentication protocol"; homepage = "http://liboauth.sourceforge.net/"; diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix index 9af9a3864d2..e93bafe2b56 100644 --- a/pkgs/development/libraries/libodfgen/default.nix +++ b/pkgs/development/libraries/libodfgen/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}: +{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}: let s = # Generated upstream information rec { @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''A base library for generating ODF documents''; - license = stdenv.lib.licenses.mpl20 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mpl20 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index c2402338034..c78aa3f617e 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, expat, curl, fftw }: +{ lib, stdenv, fetchurl, expat, curl, fftw }: let version = "0.9.3"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ expat curl fftw ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://code.google.com/archive/p/musicip-libofa/"; description = "Library Open Fingerprint Architecture"; longDescription = '' diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index f11489eaf9f..10197bd8db0 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, opensp, pkg-config, libxml2, curl +{ lib, stdenv, fetchFromGitHub, opensp, pkg-config, libxml2, curl , autoconf, automake, libtool, gengetopt, libiconv }: stdenv.mkDerivation rec { @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; nativeBuildInputs = [ pkg-config libtool autoconf automake gengetopt ]; - buildInputs = [ opensp libxml2 curl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + buildInputs = [ opensp libxml2 curl ] ++ lib.optional stdenv.isDarwin libiconv; meta = { description = "Opensource implementation of the Open Financial eXchange specification"; homepage = "http://libofx.sourceforge.net/"; license = "LGPL"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 50950a15a87..83555ccab8c 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "libogg-1.3.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ # Fix unsigned typedefs on darwin. Remove with the next release https://github.com/xiph/ogg/pull/64 (fetchpatch { url = "https://github.com/xiph/ogg/commit/c8fca6b4a02d695b1ceea39b330d4406001c03ed.patch"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Media container library to manipulate Ogg files"; longDescription = '' Library to work with Ogg multimedia container format. diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index 687e1d9c43d..15856c0262c 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libogg, pkg-config }: +{ lib, stdenv, fetchurl, libogg, pkg-config }: stdenv.mkDerivation rec { name = "liboggz-1.1.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://xiph.org/oggz/"; description = "A C library and tools for manipulating with Ogg files and streams"; longDescription = '' diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index c1c41ce559f..8d929975815 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkg-config }: +{lib, stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { name = "liboil-0.3.17"; @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix" # errors - configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64"; + configureFlags = lib.optional stdenv.isDarwin "--build=x86_64"; # fixes a cast in inline asm: easier than patching - buildFlags = stdenv.lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions"; + buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions"; - meta = with stdenv.lib; { + meta = with lib; { description = "A library of simple functions that are optimized for various CPUs"; homepage = "https://liboil.freedesktop.org"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 854c2732c12..5e3b0c6798a 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libomxil-bellagio"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; configureFlags = - stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" ]; + lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" ]; patches = [ ./fedora-fixes.patch ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # developed anymore. Alternatively, gcc7Stdenv could be used. NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds -Wno-error=stringop-overflow=8"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/omxil/"; description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/liboop/default.nix b/pkgs/development/libraries/liboop/default.nix index 75fa4a80a31..5d849ebe1ca 100644 --- a/pkgs/development/libraries/liboop/default.nix +++ b/pkgs/development/libraries/liboop/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "liboop-1.0"; @@ -12,6 +12,6 @@ stdenv.mkDerivation { description = "Event loop library"; homepage = "http://liboop.ofb.net/"; license = "LGPL"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index 8db034683dc..e448d225b99 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages +{ lib, stdenv, buildPackages , autoreconfHook, bison, binutils-unwrapped , libiberty, libbfd }: @@ -34,7 +34,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A library from binutils for manipulating machine code"; homepage = "https://www.gnu.org/software/binutils/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/pkgs/development/libraries/libopenaptx/default.nix index 5b02d70f683..9cc57d1a465 100644 --- a/pkgs/development/libraries/libopenaptx/default.nix +++ b/pkgs/development/libraries/libopenaptx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libopenaptx"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Audio Processing Technology codec (aptX)"; license = licenses.lgpl21Plus; homepage = "https://github.com/pali/libopenaptx"; diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index 956538b7624..c309c70e3d3 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses perl ]; - configureFlags = stdenv.lib.optional (perl == null) "--with-perl-bindings=no"; + configureFlags = lib.optional (perl == null) "--with-perl-bindings=no"; - meta = with stdenv.lib; { + meta = with lib; { description = "C library to generate ICMP echo requests (a.k.a. ping packets)"; longDescription = '' liboping is a C library to generate ICMP echo requests, better known as diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index e8d3682b8b3..51179ecb9a0 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , fixedPoint ? false, withCustomModes ? true }: let @@ -15,14 +15,14 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - configureFlags = stdenv.lib.optional fixedPoint "--enable-fixed-point" - ++ stdenv.lib.optional withCustomModes "--enable-custom-modes"; + configureFlags = lib.optional fixedPoint "--enable-fixed-point" + ++ lib.optional withCustomModes "--enable-custom-modes"; doCheck = !stdenv.isi686; # test_unit_LPC_inv_pred_gain fails - meta = with stdenv.lib; { + meta = with lib; { description = "Open, royalty-free, highly versatile audio codec"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://www.opus-codec.org/"; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix index 9aaf52abdf1..c2d77185e69 100644 --- a/pkgs/development/libraries/libopusenc/default.nix +++ b/pkgs/development/libraries/libopusenc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libopus }: +{ lib, stdenv, fetchurl, pkg-config, libopus }: let version = "0.2.1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libopus ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for encoding .opus audio files and live streams"; license = licenses.bsd3; homepage = "https://www.opus-codec.org/"; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 4d4ab13e8c5..a6b17016719 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , pkg-config @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support"; homepage = "https://libosinfo.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index 10e6d61d156..c5b801f5d47 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, protozero, expat, zlib, bzip2, boost }: +{ lib, stdenv, fetchFromGitHub, cmake, protozero, expat, zlib, bzip2, boost }: stdenv.mkDerivation rec { pname = "libosmium"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast and flexible C++ library for working with OpenStreetMap data"; homepage = "https://osmcode.org/libosmium/"; license = licenses.boost; diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix index d1f6ea5c2ea..1cbfe44ef4e 100644 --- a/pkgs/development/libraries/libosmpbf/default.nix +++ b/pkgs/development/libraries/libosmpbf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, protobuf}: +{lib, stdenv, fetchurl, protobuf}: stdenv.mkDerivation { name = "libosmpbf-1.3.3"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/scrosby/OSM-binary"; description = "C library to read and write OpenStreetMap PBF files"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index 15b6da0ac5b..824dac3a2f5 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let version = "1.6.2"; in @@ -13,11 +13,11 @@ stdenv.mkDerivation { configureFlags = [ "ac_cv_va_copy=yes" - ] ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; patches = [ ./shtool.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.ossp.org/pkg/lib/uuid/"; description = "OSSP uuid ISO-C and C++ shared library"; longDescription = diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index 10619f9682b..7c2a2b9a6b9 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, autoreconfHook }: +{ lib, stdenv, fetchurl, libgcrypt, autoreconfHook }: stdenv.mkDerivation rec { name = "libotr-4.1.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libgcrypt ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.cypherpunks.ca/otr/"; repositories.git = "git://git.code.sf.net/p/otr/libotr"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix index 80a84974b7a..e4a8d95f4b0 100644 --- a/pkgs/development/libraries/libow/default.nix +++ b/pkgs/development/libraries/libow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkg-config, libtool }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, libtool }: stdenv.mkDerivation rec { version = "3.2p4"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "1-Wire File System full library"; homepage = "https://owfs.org/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index 06871158609..14270a36ec5 100644 --- a/pkgs/development/libraries/libowfat/default.nix +++ b/pkgs/development/libraries/libowfat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libowfat-0.32"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A GPL reimplementation of libdjb"; homepage = "https://www.fefe.de/libowfat/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index 26a95090ef6..eb577a7f5a1 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkg-config +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, pkg-config , openssl }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier"; homepage = "https://github.com/OpenSC/libp11"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libpam-wrapper/default.nix b/pkgs/development/libraries/libpam-wrapper/default.nix index f8359cded93..7d026eb5a09 100644 --- a/pkgs/development/libraries/libpam-wrapper/default.nix +++ b/pkgs/development/libraries/libpam-wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , cmake , linux-pam @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { sha256 = "00mqhsashx7njrvxz085d0b88nizhdy7m3x17ip5yhvwsl63km6p"; }; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional enablePython [ python ]; + nativeBuildInputs = [ cmake ] ++ lib.optional enablePython [ python ]; # We must use linux-pam, using openpam will result in broken fprintd. buildInputs = [ linux-pam ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wrapper for testing PAM modules"; homepage = "https://cwrap.org/pam_wrapper.html"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix index d7863e29d58..b9372ba1d40 100644 --- a/pkgs/development/libraries/libpaper/default.nix +++ b/pkgs/development/libraries/libpaper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { version = "1.1.28"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for handling paper characteristics"; homepage = "http://packages.debian.org/unstable/source/libpaper"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index f8e9d6e4a0b..625e780d192 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libsigcxx }: +{ lib, stdenv, fetchurl, pkg-config, libsigcxx }: let version = "0.4"; in @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { patches = [ ./libpar2-0.4-external-verification.patch ]; - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; meta = { homepage = "http://parchive.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "A library for using Parchives (parity archive volume sets)"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 2999b3d3172..0b30bf6c2b0 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, flex, bison, bluez, pkg-config, withBluez ? false }: +{ lib, stdenv, fetchurl, flex, bison, bluez, pkg-config, withBluez ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libpcap"; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 51717e84259..a8ef9e2f9bb 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome3 , glib, gtk3, gobject-introspection, python3, ncurses }: @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A GObject-based plugins engine"; homepage = "https://wiki.gnome.org/Projects/Libpeas"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 63b826258ae..20c4c0a1c6e 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { NIX_CFLAGS_COMPILE = "-Wno-error"; - meta = with stdenv.lib; { + meta = with lib; { description = "Helper library to program the performance monitoring events"; longDescription = '' This package provides a library, called libpfm4 which is used to @@ -32,7 +32,7 @@ stdenv.mkDerivation (rec { maintainers = [ maintainers.pierron ]; platforms = platforms.linux; }; -} // stdenv.lib.optionalAttrs ( ! enableShared ) +} // lib.optionalAttrs ( ! enableShared ) { CONFIG_PFMLIB_SHARED = "n"; } diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix index 7710c208199..280059fbab3 100644 --- a/pkgs/development/libraries/libpgf/default.nix +++ b/pkgs/development/libraries/libpgf/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, dos2unix }: +{ lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix }: -with stdenv.lib; +with lib; let version = "6.14.12"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.libpgf.org/"; description = "Progressive Graphics Format"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index 0ec92b369d0..2ff59e055f9 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gmock, boost, pkg-config, protobuf, icu }: +{ lib, stdenv, fetchFromGitHub, cmake, gmock, boost, pkg-config, protobuf, icu }: stdenv.mkDerivation rec { pname = "phonenumber"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { checkPhase = "./libphonenumber_test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Google's i18n library for parsing and using phone numbers"; license = licenses.asl20; maintainers = with maintainers; [ illegalprime ]; diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index a3274fc9053..2d802cf28d7 100644 --- a/pkgs/development/libraries/libpinyin/default.nix +++ b/pkgs/development/libraries/libpinyin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ lib, stdenv, fetchurl, fetchFromGitHub , autoreconfHook , glib , db @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook glib db pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for intelligent sentence-based Chinese pinyin input method"; homepage = "https://sourceforge.net/projects/libpinyin"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix index be3ab953c0a..b5310c3cb8c 100644 --- a/pkgs/development/libraries/libpipeline/default.nix +++ b/pkgs/development/libraries/libpipeline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libpipeline-1.5.3"; @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1c5dl017xil2ssb6a5vg927bnsbc9vymfgi9ahvqbb8gypx0igsx"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libpipeline.nongnu.org"; description = "C library for manipulating pipelines of subprocesses in a flexible and convenient way"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 956b34fd93d..94301b34fbc 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , fetchpatch , meson @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Reusable library for GPU-accelerated video/image rendering primitives"; longDescription = '' Reusable library for GPU-accelerated image/view processing primitives and diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 447440b9c76..c8e9ddb82c5 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python, glib }: +{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python, glib }: stdenv.mkDerivation rec { pname = "libplist"; @@ -11,27 +11,27 @@ stdenv.mkDerivation rec { sha256 = "1vxhpjxniybqsg5wcygmdmr5dv7p2zb34dqnd3bi813rnnzsdjm6"; }; - outputs = ["bin" "dev" "out" ] ++ stdenv.lib.optional enablePython "py"; + outputs = ["bin" "dev" "out" ] ++ lib.optional enablePython "py"; nativeBuildInputs = [ pkg-config autoreconfHook - ] ++ stdenv.lib.optionals enablePython [ + ] ++ lib.optionals enablePython [ python python.pkgs.cython ]; - configureFlags = stdenv.lib.optionals (!enablePython) [ + configureFlags = lib.optionals (!enablePython) [ "--without-cython" ]; propagatedBuildInputs = [ glib ]; - postFixup = stdenv.lib.optionalString enablePython '' + postFixup = lib.optionalString enablePython '' moveToOutput "lib/${python.libPrefix}" "$py" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to handle Apple Property List format in binary or XML"; homepage = "https://github.com/libimobiledevice/libplist"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index 7199695ae74..bf3d5168d6c 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: assert stdenv.hostPlatform == stdenv.buildPlatform -> zlib != null; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { postInstall = ''mv "$out/bin" "$dev/bin"''; - meta = with stdenv.lib; { + meta = with lib; { description = "The official reference implementation for the PNG file format"; homepage = "http://www.libpng.org/pub/png/libpng.html"; license = licenses.libpng; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 489007bc417..aeb3fcba06f 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, apngSupport ? true }: +{ lib, stdenv, fetchurl, zlib, apngSupport ? true }: assert zlib != null; @@ -8,7 +8,7 @@ let url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; sha256 = "1dh0250mw9b2hx7cdmnb2blk7ddl49n6vx8zz7jdmiwxy38v4fw2"; }; - whenPatched = stdenv.lib.optionalString apngSupport; + whenPatched = lib.optionalString apngSupport; in stdenv.mkDerivation rec { name = "libpng" + whenPatched "-apng" + "-${version}"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { passthru = { inherit zlib; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; homepage = "http://www.libpng.org/pub/png/libpng.html"; license = licenses.libpng2; diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix index 3a90f28e757..31fb5cb05ba 100644 --- a/pkgs/development/libraries/libpointmatcher/default.nix +++ b/pkgs/development/libraries/libpointmatcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo }: +{ lib, stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo }: stdenv.mkDerivation rec { pname = "libpointmatcher"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ./utest/utest --path ../examples/data/ ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "An \"Iterative Closest Point\" library for 2-D/3-D mapping in robotic"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix index 6f706634391..5eacdaa8f3c 100644 --- a/pkgs/development/libraries/libportal/default.nix +++ b/pkgs/development/libraries/libportal/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , meson @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Flatpak portal library"; homepage = "https://github.com/flatpak/libportal"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 4876de5551d..afd1a6365b4 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config , cmake @@ -82,21 +82,21 @@ stdenv.mkDerivation rec { sha256 = "0pdy9sw49lxpaiwq073cisk0npir5bkch70nimdmpszxwp3fv1d8"; }) - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ (fetchpatch { url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch"; sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1"; }) ]; - postFixup = stdenv.lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.isLinux '' # config_gnome3 uses the helper to find GNOME proxy settings wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" ''; doCheck = false; # fails 1 out of 10 tests - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl21; homepage = "http://libproxy.github.io/libproxy/"; diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix index d5418ec09d8..f0638150573 100644 --- a/pkgs/development/libraries/libpseudo/default.nix +++ b/pkgs/development/libraries/libpseudo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkg-config, glib, ncurses}: +{lib, stdenv, fetchurl, pkg-config, glib, ncurses}: stdenv.mkDerivation rec { name = "libpseudo-1.2.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libpseudo.sourceforge.net/"; description = "Simple, thread-safe messaging between threads"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index ed6d63aa524..e68219f6348 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoreconfHook , docbook_xsl @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pkg-config python3 libxslt - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt" - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ "--enable-valgrind-tests" ]; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "C library for the Publix Suffix List"; longDescription = '' libpsl is a C library for the Publix Suffix List (PSL). A "public suffix" diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index 829bea9351e..40f6b3b1aee 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, boost, libgsf, +{ lib, stdenv, fetchurl, autoreconfHook, boost, libgsf, pkg-config, bzip2, xmlto, gettext, imagemagick, doxygen }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.five-ten-sg.com/libpst/"; description = "A library to read PST (MS Outlook Personal Folders) files"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index ca1bfecfadb..80e6e6fe668 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkg-config, doxygen, +{ lib, stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkg-config, doxygen, autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { substituteInPlace libqalculate/Calculator-plot.cc \ --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \ --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - ' - '' + stdenv.lib.optionalString stdenv.cc.isClang '' + '' + lib.optionalString stdenv.cc.isClang '' substituteInPlace src/qalc.cc \ --replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))' ''; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An advanced calculator library"; homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index 7f3ca25ec40..3f0a9a28d19 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config }: +{ lib, stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { name = "libqb-0.17.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/clusterlabs/libqb"; description = "A library providing high performance logging, tracing, ipc, and poll"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index 0d1da964adb..4fc50f20730 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qmake, qtbase, libGLU, AGL }: +{ lib, stdenv, fetchurl, qmake, qtbase, libGLU, AGL }: stdenv.mkDerivation rec { pname = "libqglviewer"; @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase libGLU ] - ++ stdenv.lib.optional stdenv.isDarwin AGL; + ++ lib.optional stdenv.isDarwin AGL; postPatch = '' cd QGLViewer ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers"; homepage = "http://libqglviewer.com"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index de38e5d3b6e..e616fae9250 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }: +{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }: stdenv.mkDerivation rec { pname = "libqmi"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/libqmi/"; description = "Modem protocol helper library"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libr3/default.nix b/pkgs/development/libraries/libr3/default.nix index d838c07de87..34ac547f492 100644 --- a/pkgs/development/libraries/libr3/default.nix +++ b/pkgs/development/libraries/libr3/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pcre , pkg-config @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "A high-performance path dispatching library"; homepage = "https://github.com/c9s/r3"; - license = [ stdenv.lib.licenses.mit ]; + license = [ lib.licenses.mit ]; }; } diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix index 664b8d1a7e0..217a83bcebc 100644 --- a/pkgs/development/libraries/libraspberrypi/default.nix +++ b/pkgs/development/libraries/libraspberrypi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DVMCS_INSTALL_PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Userland tools & libraries for interfacing with Raspberry Pi hardware"; homepage = "https://github.com/raspberrypi/userland"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 123bd87ae30..3ff7e725f3d 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }: stdenv.mkDerivation rec { pname = "libraw"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; homepage = "https://www.libraw.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix index a99e4d22077..7bf99e739f3 100644 --- a/pkgs/development/libraries/libraw1394/default.nix +++ b/pkgs/development/libraries/libraw1394/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libraw1394-2.1.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0z5md84941ky5l7afayx2z6j0sk0mildxbjajq6niznd44ky7i6x"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface"; homepage = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix index ef194bb0b1e..8d1b1f2a0ea 100644 --- a/pkgs/development/libraries/librdf/raptor.nix +++ b/pkgs/development/libraries/librdf/raptor.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, curl }: +{ lib, stdenv, fetchurl, libxml2, curl }: stdenv.mkDerivation rec { name = "raptor-1.4.21"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; homepage = "http://librdf.org/raptor"; - license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = with lib.licenses; [ lgpl21 asl20 ]; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index 4645b5ea0d8..bb8aeefa102 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, libxslt }: +{ lib, stdenv, fetchurl, libxml2, libxslt }: stdenv.mkDerivation rec { pname = "raptor2"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; homepage = "http://librdf.org/raptor"; - license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; - maintainers = with stdenv.lib.maintainers; [ marcweber ]; - platforms = stdenv.lib.platforms.unix; + license = with lib.licenses; [ lgpl21 asl20 ]; + maintainers = with lib.maintainers; [ marcweber ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index ff8679b86ab..88acc372f7f 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, librdf_raptor2, gmp, pkg-config, pcre, libxml2, perl }: +{ lib, stdenv, fetchurl, librdf_raptor2, gmp, pkg-config, pcre, libxml2, perl }: stdenv.mkDerivation rec { name = "rasqal-0.9.33"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Library that handles Resource Description Framework (RDF)"; homepage = "http://librdf.org/rasqal"; - license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; - maintainers = with stdenv.lib.maintainers; [ marcweber ]; - platforms = stdenv.lib.platforms.unix; + license = with lib.licenses; [ lgpl21 asl20 ]; + maintainers = with lib.maintainers; [ marcweber ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index f9863b922c7..731d1cf1868 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, openssl, libxslt, perl +{ lib, stdenv, fetchurl, pkg-config, openssl, libxslt, perl , curl, pcre, libxml2, librdf_rasqal, gmp , libmysqlclient, withMysql ? false , postgresql, withPostgresql ? false @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ openssl libxslt curl pcre libxml2 gmp ] - ++ stdenv.lib.optional withMysql libmysqlclient - ++ stdenv.lib.optional withSqlite sqlite - ++ stdenv.lib.optional withPostgresql postgresql - ++ stdenv.lib.optional withBdb db; + ++ lib.optional withMysql libmysqlclient + ++ lib.optional withSqlite sqlite + ++ lib.optional withPostgresql postgresql + ++ lib.optional withBdb db; propagatedBuildInputs = [ librdf_rasqal ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-threads" ] - ++ stdenv.lib.optionals withBdb [ + ++ lib.optionals withBdb [ "--with-bdb-include=${db.dev}/include" "--with-bdb-lib=${db.out}/lib" ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 1 out of 17 tests with a segmentation fault - meta = with stdenv.lib; { + meta = with lib; { description = "C libraries that provide support for the Resource Description Framework (RDF)"; homepage = "http://librdf.org/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 6e1d0a8ce3c..d2f6e31596f 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, openssl}: +{lib, stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { version = "0.6.1"; pname = "libre"; @@ -8,15 +8,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib openssl ]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] - ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" - ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}" + ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" + ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}" ; meta = { description = "A library for real-time communications with async IO support and a complete SIP stack"; homepage = "http://www.creytiv.com/re.html"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [raskin]; - license = stdenv.lib.licenses.bsd3; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [raskin]; + license = lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 9a2ea6d033e..82761dc3d00 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { cp ../wrappers/python/pyrealsense2/__init__.py $out/${pythonPackages.python.sitePackages}/pyrealsense2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)"; homepage = "https://github.com/IntelRealSense/librealsense"; license = licenses.asl20; diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 0a56e4199e4..edf927e8664 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoreconfHook , gnutls , openssl @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gnutls zlib openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A reliable logging library"; homepage = "https://www.librelp.com/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 012ac2a46a7..4e8d6fca616 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, openssl, libre}: +{lib, stdenv, fetchurl, zlib, openssl, libre}: stdenv.mkDerivation rec { version = "0.6.0"; pname = "librem"; @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { "LIBRE_INC=${libre}/include/re" ''PREFIX=$(out)'' ] - ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.lib.getDev stdenv.cc.cc}" - ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}" + ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.lib.getDev stdenv.cc.cc}" + ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}" ; meta = { description = " A library for real-time audio and video processing"; homepage = "http://www.creytiv.com/rem.html"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [raskin]; - license = stdenv.lib.licenses.bsd3; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [raskin]; + license = lib.licenses.bsd3; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; downloadURLRegexp = "/rem-.*[.]tar[.].*"; diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index 747f9495015..74c45f00adc 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pkg-config, autoreconfHook , readline, texinfo , gdbm, gmp, libffi }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "librep"; diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix index 80dd4e05b21..0756874b3e7 100644 --- a/pkgs/development/libraries/libresample/default.nix +++ b/pkgs/development/libraries/libresample/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake}: +{lib, stdenv, fetchurl, cmake}: let patch = fetchurl { @@ -20,9 +20,9 @@ stdenv.mkDerivation { meta = { description = "A real-time library for sampling rate conversion library"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; homepage = "https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html"; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index bff441589c2..7b1ff8235aa 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, glib, libsoup, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, glib, libsoup, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "rest"; version = "0.8.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Helper library for RESTful services"; homepage = "https://wiki.gnome.org/Projects/Librest"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index d36157a883c..32628695966 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, pkg-config, cppunit, zlib}: +{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib}: let s = # Generated upstream information rec { @@ -35,8 +35,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''A base library for writing document import filters''; - license = stdenv.lib.licenses.mpl20 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mpl20 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/librevisa/default.nix b/pkgs/development/libraries/librevisa/default.nix index f1df19dc2e5..892bbbbbfc0 100644 --- a/pkgs/development/libraries/librevisa/default.nix +++ b/pkgs/development/libraries/librevisa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libusb1 }: +{ lib, stdenv, fetchurl, pkg-config, libusb1 }: # TODO: add VXI development files, for VXI-11 (TCPIP) support @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Implementation of the VISA standard (for instrument control)"; longDescription = '' LibreVISA aims to be a compliant implementation of the VISA standard in a diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 4de2f1f8d3f..b6db462f3c3 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, +{ lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, libyamlcpp, gmock }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gmock ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://rime.im/"; description = "Rime Input Method Engine, the core library"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/development/libraries/libroxml/default.nix index b72ffb5b7ec..de1877f2ab4 100644 --- a/pkgs/development/libraries/libroxml/default.nix +++ b/pkgs/development/libraries/libroxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "libroxml-2.3.0"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = "http://download.libroxml.net/pool/v2.x/libroxml-2.3.0.tar.gz"; sha256 = "0y0vc9n4rfbimjp28nx4kdfzz08j5xymh5xjy84l9fhfac5z5a0x"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.libroxml.net/"; description = "This library is minimum, easy-to-use, C implementation for xml file parsing"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/librseq/default.nix b/pkgs/development/libraries/librseq/default.nix index 4fd8bb7e33a..12b9b4109c7 100644 --- a/pkgs/development/libraries/librseq/default.nix +++ b/pkgs/development/libraries/librseq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoreconfHook, linuxHeaders }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { rm -rf $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Userspace library for the Linux Restartable Sequence API"; homepage = "https://github.com/compudj/librseq"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 7e2956d31cb..efdbf593463 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "02csvx2nzygh8kyal2qiy3y6xb7d52vszxxr37dzav704a9pkncv"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "--enable-vala" "--enable-installed-tests" "--enable-always-build-tests" - ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; + ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic"; makeFlags = [ "installed_test_metadir=$(installedTests)/share/installed-tests/RSVG" @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ]; NIX_CFLAGS_COMPILE - = stdenv.lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo"; + = lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo"; # It wants to add loaders and update the loaders.cache in gdk-pixbuf # Patching the Makefiles to it creates rsvg specific loaders and the @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A small library to render SVG images to Cairo surfaces"; homepage = "https://wiki.gnome.org/Projects/LibRsvg"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/librsync/0.9.nix b/pkgs/development/libraries/librsync/0.9.nix index 35ccdcdf078..74dca4e3085 100644 --- a/pkgs/development/libraries/librsync/0.9.nix +++ b/pkgs/development/libraries/librsync/0.9.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "librsync-0.9.7"; @@ -11,16 +11,16 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; configureFlags = [ - (stdenv.lib.enableFeature stdenv.isCygwin "static") - (stdenv.lib.enableFeature (!stdenv.isCygwin) "shared") + (lib.enableFeature stdenv.isCygwin "static") + (lib.enableFeature (!stdenv.isCygwin) "shared") ]; dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = { homepage = "http://librsync.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 9499be80f03..9211d9d233f 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }: +{ lib, stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }: stdenv.mkDerivation rec { pname = "librsync"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://librsync.sourceforge.net/"; license = licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; diff --git a/pkgs/development/libraries/librtprocess/default.nix b/pkgs/development/libraries/librtprocess/default.nix index adabbe11cb3..3e44bfd3d7d 100644 --- a/pkgs/development/libraries/librtprocess/default.nix +++ b/pkgs/development/libraries/librtprocess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "librtprocess"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/CarVac/librtprocess"; description = "Highly optimized library for processing RAW images"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix index 3012263cb41..5a2b8636774 100644 --- a/pkgs/development/libraries/libs3/default.nix +++ b/pkgs/development/libraries/libs3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, curl, libxml2 }: +{ lib, stdenv, fetchFromGitHub, curl, libxml2 }: stdenv.mkDerivation { name = "libs3-2018-12-03"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { makeFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bji/libs3"; description = "A library for interfacing with amazon s3"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 645c742aca0..5cf872c3fc3 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkg-config, libsndfile, ApplicationServices, Carbon, CoreServices }: +{ lib, stdenv, fetchurl, pkg-config, libsndfile, ApplicationServices, Carbon, CoreServices }: let - inherit (stdenv.lib) optionals optionalString; + inherit (lib) optionals optionalString; in stdenv.mkDerivation rec { name = "libsamplerate-0.1.9"; @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { substituteInPlace examples/Makefile --replace "-fpascal-strings" "" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Sample Rate Converter for audio"; homepage = "http://www.mega-nerd.com/SRC/index.html"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index cebfdfe3838..f4caa22b322 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libsass"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A C/C++ implementation of a Sass compiler"; homepage = "https://github.com/sass/libsass"; license = licenses.mit; diff --git a/pkgs/development/libraries/libschrift/default.nix b/pkgs/development/libraries/libschrift/default.nix index a06f6c50d66..3781d934612 100644 --- a/pkgs/development/libraries/libschrift/default.nix +++ b/pkgs/development/libraries/libschrift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libschrift"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeFlags = [ "libschrift.a" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tomolt/libschrift"; description = "A lightweight TrueType font rendering library"; license = licenses.isc; diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix index 7eaa8f85578..1bd22b2f790 100644 --- a/pkgs/development/libraries/libscrypt/default.nix +++ b/pkgs/development/libraries/libscrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libscrypt"; @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1d76ys6cp7fi4ng1w3mz2l0p9dbr7ljbk33dcywyimzjz8bahdng"; }; - buildFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA="; + buildFlags = lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA="; installFlags = [ "PREFIX=$(out)" ]; - installTargets = stdenv.lib.optional stdenv.isDarwin "install-osx"; + installTargets = lib.optional stdenv.isDarwin "install-osx"; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Shared library that implements scrypt() functionality"; homepage = "https://lolware.net/2014/04/29/libscrypt.html"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 472f7fdc51c..1ac5cef7c5f 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, automake, autoconf, pkg-config, libtool, python2Packages, glib, jansson}: +{lib, stdenv, fetchFromGitHub, automake, autoconf, pkg-config, libtool, python2Packages, glib, jansson}: stdenv.mkDerivation rec { version = "3.2.0"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/haiwen/libsearpc"; description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index a0414f5ba55..7ea7add23f3 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, getopt, util-linux, gperf }: +{ lib, stdenv, fetchurl, getopt, util-linux, gperf }: stdenv.mkDerivation rec { pname = "libseccomp"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { tar -zcf $pythonsrc --mtime="@$SOURCE_DATE_EPOCH" --sort=name --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "High level library for the Linux Kernel seccomp filter"; homepage = "https://github.com/seccomp/libseccomp"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index abc4b5949a8..6c28b7d16c1 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3 +{ lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3 , docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala , gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }: @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.20.4"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0a4xnfmraxchd9cq5ai66j12jv2vrgjmaaxz25kl031jvda4qnij"; }; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for storing and retrieving passwords and other secrets"; homepage = "https://wiki.gnome.org/Projects/Libsecret"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; inherit (glib.meta) platforms maintainers; }; } diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index f016e13fd89..0a2adc4126f 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, udev, darwin }: +{ lib, stdenv, fetchurl, pkg-config, udev, darwin }: stdenv.mkDerivation rec { name = "libserialport-0.1.1"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = stdenv.lib.optional stdenv.isLinux udev - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit; + buildInputs = lib.optional stdenv.isLinux udev + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform shared library for serial port access"; homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 7bd65bbdfb2..c810034f847 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, pkg-config , libvorbis, libtheora, speex }: # need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.icecast.org"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ jcumming ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix index e1c6f3efe52..8253d1df74f 100644 --- a/pkgs/development/libraries/libsieve/default.nix +++ b/pkgs/development/libraries/libsieve/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { version = "2.3.1"; pname = "libsieve"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1gllhl9hbmc86dq3k98d4kjs5bwk0p2rlk7ywqj3fjn7jw6mbhcj"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An interpreter for RFC 3028 Sieve and various extensions"; homepage = "http://sodabrew.com/libsieve/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix index 09552f86fa7..a417e0bcc1d 100644 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ b/pkgs/development/libraries/libsigcxx/1.2.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkg-config, m4}: +{lib, stdenv, fetchurl, pkg-config, m4}: stdenv.mkDerivation rec { name = "libsigc++-1.2.7"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ m4]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; description = "A typesafe callback system for standard C++"; branch = "1.2"; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index 4cc741a71c1..eac383fae0d 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, gnum4, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gnum4, gnome3 }: stdenv.mkDerivation rec { pname = "libsigc++"; version = "2.10.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; description = "A typesafe callback system for standard C++"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/pkgs/development/libraries/libsignal-protocol-c/default.nix index 6278f6234f0..203d3613af8 100644 --- a/pkgs/development/libraries/libsignal-protocol-c/default.nix +++ b/pkgs/development/libraries/libsignal-protocol-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, openssl }: stdenv.mkDerivation rec { pname = "libsignal-protocol-c"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Signal Protocol C Library"; homepage = "https://github.com/signalapp/libsignal-protocol-c"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix index 4ac48c4985f..ae7a6775de5 100644 --- a/pkgs/development/libraries/libsignon-glib/default.nix +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -1,4 +1,4 @@ -{ 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 }: +{ lib, 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 }: stdenv.mkDerivation rec { pname = "libsignon-glib"; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for managing single signon credentials which can be used from GLib applications"; homepage = "https://gitlab.com/accounts-sso/libsignon-glib"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 30921ade4cf..20cb80b1ff8 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , enableSigbusFix ? false # required by kernels < 3.18.6 }: @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { more. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index 9e151931e65..e82ecde5ddd 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub}: +{lib, stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { version = "1.8.6"; pname = "libsixel"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The SIXEL library for console graphics, and converter programs"; homepage = "http://saitoha.github.com/libsixel"; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index a950064cf6a..c4b36704cb9 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, +{ lib, stdenv, fetchFromGitHub, libtool, gettext, pkg-config, vala, gnome-common, gobject-introspection, libgee, json-glib, skk-dicts, libxkbcommon }: @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { user dictionary, skkserv, and CDB format dictionary. ''; homepage = "https://github.com/ueno/libskk"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ yuriaisaka ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix index af6d26bc22b..8bd74d29243 100644 --- a/pkgs/development/libraries/libslirp/default.nix +++ b/pkgs/development/libraries/libslirp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , meson , ninja @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { echo ${version} > .tarball-version ''; - meta = with stdenv.lib; { + meta = with lib; { description = "General purpose TCP-IP emulator"; homepage = "https://gitlab.freedesktop.org/slirp/libslirp"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/development/libraries/libsmartcols/default.nix index ceda7b5d936..f824e54cdbf 100644 --- a/pkgs/development/libraries/libsmartcols/default.nix +++ b/pkgs/development/libraries/libsmartcols/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3 }: stdenv.mkDerivation rec { name = "libsmartcols"; @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { meta = { description = "smart column output alignment library"; homepage = https://github.com/karelzak/util-linux/tree/master/libsmartcols; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ rb2k ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = with lib.maintainers; [ rb2k ]; }; } diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix index 881af18d559..ab9d7d85c86 100644 --- a/pkgs/development/libraries/libsmi/default.nix +++ b/pkgs/development/libraries/libsmi/default.nix @@ -1,4 +1,4 @@ -{ stdenv , fetchurl }: +{ lib, stdenv , fetchurl }: stdenv.mkDerivation rec { pname = "libsmi"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1lslaxr2qcj6hf4naq5n5mparfhmswsgq4wa7zm2icqvvgdcq6pj"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A Library to Access SMI MIB Information"; homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html"; license = licenses.free; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix index 6de498f6d29..fc3e15f688d 100644 --- a/pkgs/development/libraries/libsnark/default.nix +++ b/pkgs/development/libraries/libsnark/default.nix @@ -5,7 +5,7 @@ let inherit (stdenv) lib; in stdenv.mkDerivation rec { name = "libsnark-pre${version}"; - version = stdenv.lib.substring 0 8 rev; + version = lib.substring 0 8 rev; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; @@ -20,10 +20,10 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library for zkSNARKs"; homepage = "https://github.com/scipr-lab/libsnark"; license = licenses.mit; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index d154a7194bb..61e6d9cd765 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, autogen, flac, libogg, libopus, libvorbis, pkg-config, python3 +{ lib, stdenv, fetchFromGitHub, autoreconfHook, autogen, flac, libogg, libopus, libvorbis, pkg-config, python3 , Carbon, AudioToolbox }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ]; buildInputs = [ flac libogg libopus libvorbis ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ]; + ++ lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ]; enableParallelBuilding = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # need headers from the Carbon.framework in /System/Library/Frameworks to # compile this on darwin -- not sure how to handle - preConfigure = stdenv.lib.optionalString stdenv.isDarwin + preConfigure = lib.optionalString stdenv.isDarwin '' NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers" ''; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # Needed on Darwin. NIX_CFLAGS_LINK = "-logg -lvorbis"; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library for reading and writing files containing sampled sound"; homepage = "https://libsndfile.github.io/libsndfile/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index c6381e2a141..db2cd044592 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libsodium-1.0.18"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern and easy-to-use crypto library"; homepage = "http://doc.libsodium.org/"; license = licenses.isc; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index d75d9cc0780..bfacecde256 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: +{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { version = "0.7.16"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; buildInputs = [ zlib expat rpm db ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A free package dependency solver"; homepage = "https://github.com/openSUSE/libsolv"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index a4a81af532a..ac9f3b25654 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }: +{ lib, stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }: stdenv.mkDerivation rec { version = "2.0.0"; @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libjack2 libpulseaudio ] - ++ stdenv.lib.optional stdenv.isLinux alsaLib - ++ stdenv.lib.optional stdenv.isDarwin AudioUnit; + ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional stdenv.isDarwin AudioUnit; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes"; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross platform audio input and output"; homepage = "http://libsound.io/"; license = licenses.mit; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index d052cbdc877..47fcdd41f8a 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "2.72.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p"; }; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = { description = "HTTP client/server library for GNOME"; homepage = "https://wiki.gnome.org/Projects/libsoup"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; inherit (glib.meta) maintainers platforms; }; } diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index 4b5f7f4b3f1..4c778fbd690 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "1.8.5"; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Extensible spatial index library in C++"; homepage = "http://libspatialindex.github.io/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index ec2a6242d9e..465aa941f39 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkg-config, ghostscript, cairo }: +{ fetchurl, lib, stdenv, pkg-config, ghostscript, cairo }: stdenv.mkDerivation rec { name = "libspectre-0.2.7"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { handling and rendering Postscript documents. ''; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix index 42b39179b20..6a9cb8b647c 100644 --- a/pkgs/development/libraries/libspf2/default.nix +++ b/pkgs/development/libraries/libspf2/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libspf2"; diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index d466b4e85a9..03bfe14d3be 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -1,4 +1,4 @@ -{stdenv, pkg-config, autoreconfHook, fetchFromGitHub }: +{lib, stdenv, pkg-config, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libspiro"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library that simplifies the drawing of beautiful curves"; homepage = "https://github.com/fontforge/libspiro"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index feb1f8e1736..b39944d13dc 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libspotify, alsaLib, readline, pkg-config, apiKey ? null, unzip, gnused }: +{ lib, stdenv, fetchurl, libspotify, alsaLib, readline, pkg-config, apiKey ? null, unzip, gnused }: let version = "12.1.51"; @@ -47,14 +47,14 @@ else stdenv.mkDerivation { # darwin-specific - buildInputs = stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip; + buildInputs = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip; # linux-specific - installFlags = stdenv.lib.optional isLinux + installFlags = lib.optional isLinux "prefix=$(out)"; - patchPhase = stdenv.lib.optionalString isLinux + patchPhase = lib.optionalString isLinux "${gnused}/bin/sed -i 's/ldconfig//' Makefile"; - postInstall = stdenv.lib.optionalString isLinux + postInstall = lib.optionalString isLinux "mv -v share $out"; passthru = { @@ -67,7 +67,7 @@ else stdenv.mkDerivation { src = libspotify.src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libspotify readline ] - ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; + ++ lib.optional (!stdenv.isDarwin) alsaLib; postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples"; patchPhase = "cp ${apiKey} appkey.c"; installPhase = '' @@ -82,7 +82,7 @@ else stdenv.mkDerivation { inherit apiKey; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Spotify API library"; homepage = "https://developer.spotify.com/technologies/libspotify"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix index 0d186204f92..3da48f77254 100644 --- a/pkgs/development/libraries/libsrs2/default.nix +++ b/pkgs/development/libraries/libsrs2/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { description = "The next generation SRS library from the original designer of SRS"; license = with lib.licenses; [ gpl2 bsd3 ]; homepage = "https://www.libsrs2.org/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 95d4dc02029..c613cfab777 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, cmake, zlib, openssl, libsodium }: +{ lib, stdenv, fetchurl, pkg-config, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { pname = "libssh"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SSH client library"; homepage = "https://libssh.org"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 8ce9c814df0..ed09e8ba562 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, zlib, windows }: +{ lib, stdenv, fetchurl, openssl, zlib, windows }: stdenv.mkDerivation rec { pname = "libssh2"; @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; buildInputs = [ openssl zlib ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; + ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; patches = [ # Not able to use fetchpatch here: infinite recursion ./CVE-2019-17498.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A client-side C library implementing the SSH2 protocol"; homepage = "https://www.libssh2.org"; platforms = platforms.all; diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index 70a632dd4a7..6d874fe2367 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , IOKit ? null }: stdenv.mkDerivation rec { @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "15m1sl990l85ijf8pnc6hdfha6fqyiq74mijrzm3xz4zzxm91wav"; }; - buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; + buildInputs = [] ++ lib.optional stdenv.isDarwin IOKit; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.i-scream.org/libstatgrab/"; description = "A library that provides cross platforms access to statistics about the running system"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index e97b96d71d0..76f5b6b4b8c 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, autoconf, xlibsWrapper}: +{lib, stdenv, fetchurl, automake, autoconf, xlibsWrapper}: stdenv.mkDerivation { name = "libstroke-0.5.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "A library for simple gesture recognition"; homepage = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; longDescription = '' libstroke, last updated in 2001, still successfully provides a basic @@ -29,6 +29,6 @@ stdenv.mkDerivation { easy to work with, and notably used by FVWM. ''; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix index 72cc24fcfdb..ccc6fedd916 100644 --- a/pkgs/development/libraries/libstrophe/default.nix +++ b/pkgs/development/libraries/libstrophe/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , libtool @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple, lightweight C library for writing XMPP clients"; longDescription = '' libstrophe is a lightweight XMPP client library written in C. It has diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix index 11a5cdcf4e9..08be9c1a35d 100644 --- a/pkgs/development/libraries/libsurvive/default.nix +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Source Lighthouse Tracking System"; homepage = "https://github.com/cntools/libsurvive"; license = licenses.mit; diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index 5dc4deb30be..6f4741ed4d0 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "libsvm"; @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { ln -s $out/include/svm.h $out/include/libsvm/svm.h ''; - postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.isDarwin '' install_name_tool -id libsvm.2.dylib $out/lib/libsvm.2.dylib; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for support vector machines"; homepage = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/development/libraries/libsystemtap/default.nix index b46a848a041..1ce7ef58c88 100644 --- a/pkgs/development/libraries/libsystemtap/default.nix +++ b/pkgs/development/libraries/libsystemtap/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, gettext, python, elfutils}: +{lib, stdenv, fetchgit, gettext, python, elfutils}: stdenv.mkDerivation { pname = "libsystemtap"; @@ -20,11 +20,11 @@ stdenv.mkDerivation { cp -r includes/* $out/include/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Statically defined probes development files"; homepage = "https://sourceware.org/systemtap/"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = [ stdenv.lib.maintainers.farlion ]; + maintainers = [ lib.maintainers.farlion ]; }; } diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index d6eb2647fbd..ce7cb6bfd1e 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkg-config, cmake, perl }: +{ lib, stdenv, fetchurl, pkg-config, cmake, perl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libtap"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ cmake perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to implement a test protocol"; longDescription = '' libtap is a library to implement the Test Anything Protocol for diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix index a31fde0d31d..3e5b4cd23e9 100644 --- a/pkgs/development/libraries/libtar/default.nix +++ b/pkgs/development/libraries/libtar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { version = "1.2.20"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C library for manipulating POSIX tar files"; homepage = "https://repo.or.cz/libtar"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 90dde37a416..2239d7311f5 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, texinfo }: +{ lib, stdenv, fetchurl, perl, texinfo }: stdenv.mkDerivation rec { name = "libtasn1-4.16.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { else null; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.gnu.org/software/libtasn1/"; description = "An ASN.1 library"; longDescription = '' diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 420a4c6ad20..3e77d0876be 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, cmake, SDL, libGLU, libGL, upx, zlib }: +{ lib, stdenv, fetchFromBitbucket, cmake, SDL, libGLU, libGL, upx, zlib }: stdenv.mkDerivation { @@ -27,8 +27,8 @@ stdenv.mkDerivation { meta = { description = "API for roguelike games"; homepage = "http://roguecentral.org/doryen/libtcod/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.skeidel ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.skeidel ]; }; } diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix index 7ce5b2f3214..eebaee394ee 100644 --- a/pkgs/development/libraries/libtelnet/default.nix +++ b/pkgs/development/libraries/libtelnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, zlib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, zlib }: stdenv.mkDerivation { pname = "libtelnet"; @@ -17,8 +17,8 @@ stdenv.mkDerivation { meta = { description = "Simple RFC-complient TELNET implementation as a C library"; homepage = "https://github.com/seanmiddleditch/libtelnet"; - license = stdenv.lib.licenses.publicDomain; - maintainers = [ stdenv.lib.maintainers.tomberek ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.publicDomain; + maintainers = [ lib.maintainers.tomberek ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index 4be42ff745e..9779ad6b9e5 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; makeFlags = [ "PREFIX=$(out)" ] - ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; + ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; nativeBuildInputs = [ libtool pkg-config ]; buildInputs = [ ncurses unibilium ]; diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/development/libraries/libthai/default.nix index 6179ad0f6bd..ad00906bb8c 100644 --- a/pkgs/development/libraries/libthai/default.nix +++ b/pkgs/development/libraries/libthai/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libdatrie }: +{ lib, stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libdatrie }: stdenv.mkDerivation rec { pname = "libthai"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installManPage man/man3/*.3 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://linux.thai.net/projects/libthai/"; description = "Set of Thai language support routines"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 94af9d76e78..1638150c263 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libogg, libvorbis, pkg-config}: +{lib, stdenv, fetchurl, libogg, libvorbis, pkg-config}: stdenv.mkDerivation rec { name = "libtheora-1.1.1"; @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { # GCC's -fforce-addr flag is not supported by clang # It's just an optimization, so it's safe to simply remove it - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace "-fforce-addr" "" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.theora.org/"; description = "Library for Theora, a free and open video compression format"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix index 587ef2e208a..c67be246928 100644 --- a/pkgs/development/libraries/libthreadar/default.nix +++ b/pkgs/development/libraries/libthreadar/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "1.3.1"; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 9bb572a912c..3d3b3529483 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { doCheck = true; # not cross; - meta = with stdenv.lib; { + meta = with lib; { description = "Library and utilities for working with the TIFF image file format"; homepage = "http://download.osgeo.org/libtiff"; license = licenses.libtiff; diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix index d70921e3354..7279dc9ddfa 100644 --- a/pkgs/development/libraries/libtins/default.nix +++ b/pkgs/development/libraries/libtins/default.nix @@ -1,4 +1,4 @@ -{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, stdenv }: +{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, lib, stdenv }: stdenv.mkDerivation rec { pname = "libtins"; @@ -36,12 +36,12 @@ stdenv.mkDerivation rec { ''; checkTarget = "tests test"; - meta = with stdenv.lib; { + meta = with lib; { description = "High-level, multiplatform C++ network packet sniffing and crafting library"; homepage = "https://libtins.github.io/"; changelog = "https://raw.githubusercontent.com/mfontanini/${pname}/v${version}/CHANGES.md"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; maintainers = with maintainers; [ fdns ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index 4587701011d..7ed8fca3bab 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libtool }: +{ lib, stdenv, fetchurl, fetchpatch, libtool }: stdenv.mkDerivation rec { pname = "libtomcrypt"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.libtom.net/LibTomCrypt/"; description = "A fairly comprehensive, modular and portable cryptographic toolkit"; license = with licenses; [ publicDomain wtfpl ]; diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index 9a0a2def4b7..058ae524231 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool }: +{ lib, stdenv, fetchurl, libtool }: stdenv.mkDerivation rec { pname = "libtommath"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.libtom.net/LibTomMath/"; description = "A library for integer-based number-theoretic applications"; license = with licenses; [ publicDomain wtfpl ]; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix index 649d73b49b8..a898dd8e24e 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation { "--with-boost-libdir=${boostPython.out}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libtorrent.org/"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix index 9a165780b7e..fc97b629a52 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, automake, autoconf +{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf , zlib, boost, openssl, libtool, python, libiconv, ncurses, SystemConfiguration }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ automake autoconf libtool pkg-config ]; buildInputs = [ boostPython openssl zlib python libiconv ncurses ] - ++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; preConfigure = "./autotool.sh"; @@ -43,7 +43,7 @@ in stdenv.mkDerivation { "--with-boost-libdir=${boostPython.out}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libtorrent.org/"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index e9c59ed97e8..ad3a47f99ce 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , zlib, boost, openssl, python, ncurses, SystemConfiguration }: @@ -23,7 +23,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ boostPython openssl zlib python ncurses ] - ++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; postInstall = '' moveToOutput "include" "$dev" @@ -36,7 +36,7 @@ in stdenv.mkDerivation { "-Dpython-bindings=on" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libtorrent.org/"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 727516cad93..4badf32fe8c 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack +{ lib, stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack , libvpx, check, libconfig, pkg-config }: let @@ -22,7 +22,7 @@ let buildInputs = [ libsodium msgpack ncurses libconfig - ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ + ] ++ lib.optionals (!stdenv.isAarch32) [ libopus libvpx ]; @@ -37,7 +37,7 @@ let -e "s|^includedir=.*|includedir=$out/include|" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "P2P FOSS instant messaging application aimed to replace Skype"; homepage = "https://tox.chat"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix index d28fcf4a60d..77119e2830f 100644 --- a/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus , libvpx, check, libconfig, pkg-config }: stdenv.mkDerivation { @@ -33,11 +33,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ autoreconfHook libsodium ncurses check libconfig - ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ + ] ++ lib.optionals (!stdenv.isAarch32) [ libopus ]; - propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isAarch32) [ libvpx ]; + propagatedBuildInputs = lib.optionals (!stdenv.isAarch32) [ libvpx ]; # Some tests fail randomly due to timeout. This kind of problem is well known # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054} @@ -47,7 +47,7 @@ stdenv.mkDerivation { # NOTE: run the tests locally on your machine before upgrading this package! doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 73114d5bc96..d959306c971 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libxkbcommon, pkg-config, cmake }: +{ lib, stdenv, fetchFromGitHub, libxkbcommon, pkg-config, cmake }: stdenv.mkDerivation rec { pname = "libtsm"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Terminal-emulator State Machine"; homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; license = licenses.mit; diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index fd8eada261c..3be758c906f 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkg-config, json_c, hidapi }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, json_c, hidapi }: stdenv.mkDerivation rec { pname = "libu2f-host"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developers.yubico.com/libu2f-host"; description = "A C library and command-line tool that implements the host-side of the U2F protocol"; license = with licenses; [ gpl3Plus lgpl21Plus ]; diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix index b1187177f30..7f596978cf0 100644 --- a/pkgs/development/libraries/libu2f-server/default.nix +++ b/pkgs/development/libraries/libu2f-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkg-config, json_c, openssl, check, file, help2man, which, gengetopt }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, json_c, openssl, check, file, help2man, which, gengetopt }: stdenv.mkDerivation rec { name = "libu2f-server-1.1.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ json_c openssl check file help2man which gengetopt ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developers.yubico.com/libu2f-server/"; description = "A C library that implements the server-side of the U2F protocol"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 43fa300f107..443791f2451 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "uchardet"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; homepage = "https://www.freedesktop.org/wiki/Software/uchardet/"; license = licenses.mpl11; diff --git a/pkgs/development/libraries/libucl/default.nix b/pkgs/development/libraries/libucl/default.nix index b9b33453a4c..e65d0d475ff 100644 --- a/pkgs/development/libraries/libucl/default.nix +++ b/pkgs/development/libraries/libucl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config , autoreconfHook @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = with stdenv.lib; + buildInputs = with lib; concatLists ( mapAttrsToList (feat: enabled: optionals enabled (featureDeps."${feat}" or []) @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = with stdenv.lib; + configureFlags = with lib; mapAttrsToList (feat: enabled: strings.enableFeature enabled feat) features; - meta = with stdenv.lib; { + meta = with lib; { description = "Universal configuration library parser"; homepage = "https://github.com/vstakhov/libucl"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/development/libraries/libuecc/default.nix index e5d21e2d8f7..1cc3ac8ebea 100644 --- a/pkgs/development/libraries/libuecc/default.nix +++ b/pkgs/development/libraries/libuecc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake }: +{ lib, stdenv, fetchgit, cmake }: stdenv.mkDerivation rec { version = "7"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Very small Elliptic Curve Cryptography library"; homepage = "https://git.universe-factory.net/libuecc"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 74bc597c569..7002f75cc45 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, Cocoa }: let shortName = "libui"; @@ -16,20 +16,20 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake pkg-config ]; - propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux gtk3 - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + propagatedBuildInputs = lib.optional stdenv.isLinux gtk3 + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt ''; installPhase = '' mkdir -p $out/{include,lib} mkdir -p $out/lib/pkgconfig - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' mv ./out/${shortName}.so.0 $out/lib/ ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' mv ./out/${shortName}.A.dylib $out/lib/ ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib '' + '' @@ -41,11 +41,11 @@ stdenv.mkDerivation { --subst-var-by out $out \ --subst-var-by version "${version}" ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/andlabs/libui"; description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports"; license = licenses.mit; diff --git a/pkgs/development/libraries/libuinputplus/default.nix b/pkgs/development/libraries/libuinputplus/default.nix index 9f6f18555f7..9085b861078 100644 --- a/pkgs/development/libraries/libuinputplus/default.nix +++ b/pkgs/development/libraries/libuinputplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libuinputplus"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Easy-to-use uinput library in C++"; license = licenses.mit; diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix index 6515a51f137..523ce82ce22 100644 --- a/pkgs/development/libraries/libunarr/default.nix +++ b/pkgs/development/libraries/libunarr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "libunarr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/selmf/unarr"; description = "A lightweight decompression library with support for rar, tar and zip archives"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index d30c84b52a2..9e6cec471d4 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libunibreak"; version = "4.3"; src = let - rev_version = stdenv.lib.replaceStrings ["."] ["_"] version; + rev_version = lib.replaceStrings ["."] ["_"] version; in fetchFromGitHub { owner = "adah1972"; repo = pname; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/adah1972/libunibreak"; description = "Implementation of line breaking and word breaking algorithms as in the Unicode standard"; license = licenses.zlib; diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix index afae04cb6b2..2e75c783681 100644 --- a/pkgs/development/libraries/libuninameslist/default.nix +++ b/pkgs/development/libraries/libuninameslist/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/fontforge/libuninameslist/"; description = "A Library of Unicode names and annotation data"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index 14c84199c50..72027b85ed4 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, pkg-config , dbus, dbus-glib, gtk3, gobject-introspection , gtk-doc, docbook_xml_dtd_45, docbook_xsl , libxslt, libxml2 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { majorVer = "3.0"; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "A library for writing single instance applications"; license = licenses.lgpl21; maintainers = [ maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 45f5e6f786d..27db05ee98a 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, glib, gtk2, dbus-glib }: +{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, dbus-glib }: stdenv.mkDerivation rec { pname = "libunique"; version = "1.1.6"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://wiki.gnome.org/Attic/LibUnique"; description = "A library for writing single instance applications"; - license = stdenv.lib.licenses.lgpl21; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.lgpl21; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 5f300ef5199..f7a77832c18 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libiconv }: +{ fetchurl, lib, stdenv, libiconv }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" "doc" ]; - propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; configureFlags = [ "--with-libiconv-prefix=${libiconv}" @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { strings as internal in-memory representation. ''; - license = stdenv.lib.licenses.lgpl3Plus; + license = lib.licenses.lgpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index 287c185385f..f6fb9a13e4c 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , pkg-config , glib @@ -56,7 +56,7 @@ stdenv.mkDerivation { "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for instrumenting and integrating with all aspects of the Unity shell"; homepage = "https://launchpad.net/libunity"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 7e481034f43..b2b5db2309c 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nongnu.org/libunwind"; description = "A portable and efficient API to determine the call-chain of a program"; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 6046bcf8eab..d108bf4e6df 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { version = "0.12.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { preCheck = "patchShebangs tests/unit"; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Userspace RCU (read-copy-update) library"; homepage = "https://lttng.org/urcu"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 938846ace54..6a94f37181d 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit +{ lib, stdenv, fetchgit , fetchpatch }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { '' ; - meta = with stdenv.lib; { + meta = with lib; { description = "Userspace library for the Linux io_uring API"; homepage = "https://git.kernel.dk/cgit/liburing/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libusb-compat/0.1.nix b/pkgs/development/libraries/libusb-compat/0.1.nix index 41fe7cc6f1e..b23123f56ea 100644 --- a/pkgs/development/libraries/libusb-compat/0.1.nix +++ b/pkgs/development/libraries/libusb-compat/0.1.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "1nybccgjs14b3phhaycq2jx1gym4nf6sghvnv9qdfmlqxacx0jz5"; }; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch; + patches = lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch; # without this, libusb-compat is unable to find libusb1 postFixup = '' @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${lib.makeLibraryPath buildInputs} {} \; ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libusb.info/"; repositories.git = "https://github.com/libusb/libusb-compat-0.1"; description = "cross-platform user-mode USB device library"; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index fef3d168c96..33cd34ea5a0 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkg-config @@ -26,18 +26,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; propagatedBuildInputs = - stdenv.lib.optional enableUdev udev ++ - stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + lib.optional enableUdev udev ++ + lib.optionals stdenv.isDarwin [ libobjc IOKit ]; dontDisableStatic = withStatic; - configureFlags = stdenv.lib.optional (!enableUdev) "--disable-udev"; + configureFlags = lib.optional (!enableUdev) "--disable-udev"; - preFixup = stdenv.lib.optionalString enableUdev '' - sed 's,-ludev,-L${stdenv.lib.getLib udev}/lib -ludev,' -i $out/lib/libusb-1.0.la + preFixup = lib.optionalString enableUdev '' + sed 's,-ludev,-L${lib.getLib udev}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://libusb.info/"; repositories.git = "https://github.com/libusb/libusb"; description = "cross-platform user-mode USB device library"; diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index cb8e1761d82..66198a6ec33 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libplist }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libplist }: stdenv.mkDerivation rec { pname = "libusbmuxd"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libplist ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A client library to multiplex connections from and to iOS devices"; homepage = "https://github.com/libimobiledevice/libusbmuxd"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 187b8574eef..a4447ed3378 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "threadpool_multiple_event_loops" # times out on slow machines "get_passwd" # passed on NixOS but failed on other Linuxes "tcp_writealot" "udp_multicast_join" "udp_multicast_join6" # times out sometimes - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ # Sometimes: timeout (no output), failed uv_listen. Someone # should report these failures to libuv team. There tests should # be much more robust. @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "fs_event_watch_dir_recursive" "fs_event_watch_file" "fs_event_watch_file_current_dir" "fs_event_watch_file_exact_path" "process_priority" "udp_create_early_bad_bind" - ] ++ stdenv.lib.optionals stdenv.isAarch32 [ + ] ++ lib.optionals stdenv.isAarch32 [ # I observe this test failing with some regularity on ARMv7: # https://github.com/libuv/libuv/issues/1871 "shutdown_close_pipe" @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ automake autoconf libtool pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; preConfigure = '' LIBTOOLIZE=libtoolize ./autogen.sh diff --git a/pkgs/development/libraries/libuvc/default.nix b/pkgs/development/libraries/libuvc/default.nix index e2956a99432..e7ff4bb7f28 100644 --- a/pkgs/development/libraries/libuvc/default.nix +++ b/pkgs/development/libraries/libuvc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ken.tossell.net/libuvc/"; description = "Cross-platform library for USB video devices"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index dbd23c5abc9..ade56ac16ee 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.freedesktop.org/wiki/Software/vaapi"; license = licenses.mit; description = "VAAPI library: Video Acceleration API"; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index f37780f5d6d..d78332bf5aa 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "-Ddriverdir=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation for VA-API (Video Acceleration API)"; longDescription = '' VA-API is an open-source library and API specification, which provides diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index f860c328fe7..bcd24d51953 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config , libdrm, libva, libX11, libXext, libXfixes, wayland }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm libva libX11 libXext libXfixes wayland ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of utilities and examples for VA-API"; longDescription = '' libva-utils is a collection of utilities and examples to exercise VA-API diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 5224da5d9e7..85ebef12fe1 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libpthreadstubs, libXau, libXdmcp +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libpthreadstubs, libXau, libXdmcp , libXext, libvdpau, glib, libva, ffmpeg_3, libGLU }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails. needs DRI access - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/i-rinat/libvdpau-va-gl"; description = "VDPAU driver with OpenGL/VAAPI backend"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 42066bd2bf0..75dcd337c38 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, xorg, mesa, meson, ninja }: +{ lib, stdenv, fetchurl, pkg-config, xorg, mesa, meson, ninja }: stdenv.mkDerivation rec { pname = "libvdpau"; @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ xorg.libX11 ]; - mesonFlags = stdenv.lib.optional stdenv.isLinux + mesonFlags = lib.optional stdenv.isLinux [ "-Dmoduledir=${mesa.drivers.driverLink}/lib/vdpau" ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lX11"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lX11"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://people.freedesktop.org/~aplattner/vdpau/"; description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)"; license = licenses.mit; # expat version diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix index a26aa9b5694..98ad4ef7fee 100644 --- a/pkgs/development/libraries/libversion/default.nix +++ b/pkgs/development/libraries/libversion/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced version string comparison library"; homepage = "https://github.com/repology/libversion"; license = with licenses; [ mit ]; diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index 7ebabaf7257..e3b3674acc9 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkg-config, glib, ncurses, gpm}: +{lib, stdenv, fetchurl, pkg-config, glib, ncurses, gpm}: stdenv.mkDerivation rec { name = "libviper-1.4.6"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ncurses gpm]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libviper.sourceforge.net/"; description = "Simple window creation and management facilities for the console"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index e7dbd2456cb..a61094d17fe 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, gobject-introspection, intltool, vala +{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, intltool, vala , libcap_ng, libvirt, libxml2 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; strictDeps = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for working with virtual machines"; longDescription = '' libvirt-glib wraps libvirt to provide a high-level object-oriented API better diff --git a/pkgs/development/libraries/libvirt/5.9.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix index 024a667a4da..76466a1a9f5 100644 --- a/pkgs/development/libraries/libvirt/5.9.0.nix +++ b/pkgs/development/libraries/libvirt/5.9.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit +{ lib, stdenv, fetchurl, fetchgit , pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch , coreutils, libxml2, gnutls, perl, python2, attr , iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext @@ -10,7 +10,7 @@ , enableCeph ? false, ceph }: -with stdenv.lib; +with lib; # if you update, also bump and SysVirt in let @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { preConfigure = '' ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" } - PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index f8a8bec15d5..60113d492a7 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit +{ lib, stdenv, fetchurl, fetchgit , makeWrapper, autoreconfHook, fetchpatch , coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils , iproute, readline, lvm2, util-linux, systemd, libpciaccess, gettext @@ -11,7 +11,7 @@ , enableCeph ? false, ceph }: -with stdenv.lib; +with lib; # if you update, also bump and SysVirt in let @@ -72,14 +72,14 @@ in stdenv.mkDerivation rec { sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|" ''; in '' - PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables-nftables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables-nftables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' patchShebangs . # fixes /usr/bin/python references '' - + (stdenv.lib.concatStringsSep "\n" (stdenv.lib.mapAttrsToList patchBuilder overrides)); + + (lib.concatStringsSep "\n" (stdenv.lib.mapAttrsToList patchBuilder overrides)); mesonAutoFeatures = "auto"; diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index 4d17f3a8c0e..42051fe66a6 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, libwpd, libwpg, pkg-config, zlib, gperf +{ lib, stdenv, fetchurl, boost, libwpd, libwpg, pkg-config, zlib, gperf , librevenge, libxml2, icu, perl, cppunit, doxygen }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A library providing ability to interpret and import visio diagrams into various applications"; homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libvisio"; license = licenses.mpl20; diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index 9559a604f0a..7a996d3b807 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, glib }: +{ lib, stdenv, fetchurl, pkg-config, glib }: stdenv.mkDerivation rec { name = "libvisual-0.4.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "An abstraction library for audio visualisations"; homepage = "https://sourceforge.net/projects/libvisual/"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index 6a8cc859474..c4b945bed44 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, nasm }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, nasm }: stdenv.mkDerivation rec { pname = "libvmaf"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Netflix/vmaf"; description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; changelog = "https://github.com/Netflix/vmaf/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 0f4bb4950f9..9d9e47407b6 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, @@ -10,7 +10,7 @@ libvirt, xenSupport ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libvmi"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "$oldrpath:${makeLibraryPath [ xen ]}" "$libvmi" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libvmi.com/"; description = "A C library for virtual machine introspection"; longDescription = '' diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index c4e82b1c326..7c8d4a76fc9 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchpatch, cmake +{ lib, stdenv, fetchzip, fetchpatch, cmake , libjpeg, openssl, zlib, libgcrypt, libpng , systemd }: @@ -21,14 +21,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ libjpeg openssl libgcrypt libpng - ] ++ stdenv.lib.optional stdenv.isLinux systemd; + ] ++ lib.optional stdenv.isLinux systemd; propagatedBuildInputs = [ zlib ]; meta = { inherit (s) version; description = "VNC server library"; homepage = "https://libvnc.github.io/"; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 7ad8174cd48..9fd3fc59ab3 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libogg, pkg-config }: +{ lib, stdenv, fetchurl, libogg, pkg-config }: stdenv.mkDerivation rec { name = "libvorbis-1.3.7"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Vorbis audio compression reference implementation"; homepage = "https://xiph.org/vorbis/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libvpx/1_8.nix b/pkgs/development/libraries/libvpx/1_8.nix index c82b7a674ac..e78a96784d9 100644 --- a/pkgs/development/libraries/libvpx/1_8.nix +++ b/pkgs/development/libraries/libvpx/1_8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, yasm +{ lib, stdenv, fetchFromGitHub, perl, yasm , vp8DecoderSupport ? true # VP8 decoder , vp8EncoderSupport ? true # VP8 encoder , vp9DecoderSupport ? true # VP9 decoder @@ -40,7 +40,7 @@ let inherit (stdenv) is64bit isMips isDarwin isCygwin; - inherit (stdenv.lib) enableFeature optional optionals; + inherit (lib) enableFeature optional optionals; in assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; @@ -173,7 +173,7 @@ stdenv.mkDerivation rec { postInstall = ''moveToOutput bin "$bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "WebM VP8/VP9 codec SDK"; homepage = "https://www.webmproject.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 83e60466c14..5aa8cf70491 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, yasm +{ lib, stdenv, fetchFromGitHub, perl, yasm , vp8DecoderSupport ? true # VP8 decoder , vp8EncoderSupport ? true # VP8 encoder , vp9DecoderSupport ? true # VP9 decoder @@ -40,7 +40,7 @@ let inherit (stdenv) is64bit isMips isDarwin isCygwin; - inherit (stdenv.lib) enableFeature optional optionals; + inherit (lib) enableFeature optional optionals; in assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; @@ -169,7 +169,7 @@ stdenv.mkDerivation rec { postInstall = ''moveToOutput bin "$bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "WebM VP8/VP9 codec SDK"; homepage = "https://www.webmproject.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index ca50345f5b2..e4a05360183 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , perl , libtool @@ -20,11 +20,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ libtool ]; makeFlags = [ "PREFIX=$(out)" ] - ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; + ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "VT220/xterm/ECMA-48 terminal emulator library"; homepage = "http://www.leonerd.org.uk/code/libvterm/"; license = licenses.mit; diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index 6c37dc23ad7..90914d4186e 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, glib, ncurses }: +{ lib, stdenv, fetchurl, pkg-config, glib, ncurses }: stdenv.mkDerivation rec { name = "libvterm-0.99.7"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ncurses ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libvterm.sourceforge.net/"; description = "Terminal emulator library to mimic both vt100 and rxvt"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index fe9aaaed125..14b996145af 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen }: stdenv.mkDerivation rec { pname = "libwacom"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib udev libgudev ]; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.linux; homepage = "https://linuxwacom.github.io/"; description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 6d24ba7f2ed..4908dc4a9ce 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool , threadingSupport ? true # multi-threading , openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp) , pngSupport ? true, libpng ? null # PNG image format @@ -24,7 +24,7 @@ let mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libwebp"; version = "1.1.0"; diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index c56781931f3..8f749d9fe6a 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }: +{ fetchFromGitHub, lib, stdenv, cmake, openssl, zlib, libuv }: let generic = { version, sha256 }: stdenv.mkDerivation rec { @@ -22,9 +22,9 @@ let "-DLWS_WITH_SOCKS5=ON" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; - meta = with stdenv.lib; { + meta = with lib; { description = "Light, portable C library for websockets"; longDescription = '' Libwebsockets is a lightweight pure C library built to diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index 7dac3315285..d0dd593a03d 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: stdenv.mkDerivation rec { pname = "libwhereami"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost curl leatherman ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Library to report hypervisor information from inside a VM"; license = licenses.asl20; diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index c7232ef6ba0..e955fee5720 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config +{ lib, stdenv, fetchFromGitHub, pkg-config , freetype, glib, imagemagick, libjpeg, libpng, libxml2, zlib }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib imagemagick libpng glib freetype libjpeg libxml2 ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "WMF library from wvWare"; homepage = "http://wvware.sourceforge.net/libwmf.html"; downloadPage = "https://github.com/caolanm/libwmf/releases"; diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 8b0e1868501..3792b826f59 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , meson @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w"; }; @@ -62,11 +62,11 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "${pname}${stdenv.lib.versions.major version}"; + attrPath = "${pname}${lib.versions.major version}"; }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)"; license = licenses.lgpl21Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index f4305cde7d7..c0019ee268a 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, gtk2, intltool, xorg }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, xorg }: stdenv.mkDerivation rec { pname = "libwnck"; version = "2.31.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for creating task lists and pagers"; homepage = "https://gitlab.gnome.org/GNOME/libwnck"; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ johnazoidberg ]; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ johnazoidberg ]; }; } diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix index f924afd4e1a..df21f264096 100644 --- a/pkgs/development/libraries/libwpd/0.8.nix +++ b/pkgs/development/libraries/libwpd/0.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, glib, libgsf, libxml2, bzip2 }: +{ lib, stdenv, fetchurl, pkg-config, glib, libgsf, libxml2, bzip2 }: stdenv.mkDerivation rec { name = "libwpd-0.8.14"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config bzip2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for importing WordPerfect documents"; homepage = "http://libwpd.sourceforge.net"; license = with licenses; [ lgpl21 mpl20 ]; diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 7ddc7965c05..8afe549cb68 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, pkg-config, glib, libgsf, libxml2, librevenge }: +{ lib, stdenv, fetchurl, zlib, pkg-config, glib, libgsf, libxml2, librevenge }: stdenv.mkDerivation rec { name = "libwpd-0.10.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for importing and exporting WordPerfect documents"; homepage = "http://libwpd.sourceforge.net/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index bbdb10f3f0f..cf85d57a7f2 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libwpd, zlib, librevenge }: +{ lib, stdenv, fetchurl, pkg-config, libwpd, zlib, librevenge }: stdenv.mkDerivation rec { name = "libwpg-0.3.3"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libwpd zlib librevenge ]; nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libwpg.sourceforge.net"; description = "C++ library to parse WPG"; license = with licenses; [ lgpl21 mpl20 ]; diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 252b13dd6da..7dd7153bae9 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, pkg-config, librevenge, zlib }: +{ lib, stdenv, fetchurl, boost, pkg-config, librevenge, zlib }: stdenv.mkDerivation rec { pname = "libwps"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libwps.sourceforge.net/"; description = "Microsoft Works document format import filter library"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix index 271823ace28..1abefa8f437 100644 --- a/pkgs/development/libraries/libx86/default.nix +++ b/pkgs/development/libraries/libx86/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libx86"; @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { # http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html makeFlags = [ "DESTDIR=$(out)" - ] ++ stdenv.lib.optional (!stdenv.isi686) "BACKEND=x86emu"; + ] ++ lib.optional (!stdenv.isi686) "BACKEND=x86emu"; preBuild = '' sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@' sed -e s@/usr@@ -i Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Real-mode x86 code emulator"; maintainers = with maintainers; [ raskin ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix index 1b10ac5fdaa..8f9669561d6 100644 --- a/pkgs/development/libraries/libx86emu/default.nix +++ b/pkgs/development/libraries/libx86emu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl }: +{ lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { pname = "libx86emu"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "x86 emulation library"; license = licenses.bsd2; homepage = "https://github.com/wfeldt/libx86emu"; diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 3f687ad26c8..d26518c7de9 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, perl }: +{ lib, stdenv, fetchurl, gfortran, perl }: let version = "4.3.4"; @@ -23,7 +23,7 @@ in stdenv.mkDerivation { doCheck = true; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library of exchange-correlation functionals for density-functional theory"; homepage = "https://octopus-code.org/wiki/Libxc"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index 4ab63e0e9c4..b66fe5c5a21 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkg-config, libjpeg, libpng, libX11, zlib }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libjpeg, libpng, libX11, zlib }: stdenv.mkDerivation rec { pname = "libxcomp"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "NX compression library"; homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libxdg-basedir/default.nix b/pkgs/development/libraries/libxdg-basedir/default.nix index fdf62e38269..58a58f2726b 100644 --- a/pkgs/development/libraries/libxdg-basedir/default.nix +++ b/pkgs/development/libraries/libxdg-basedir/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch}: +{lib, stdenv, fetchurl, fetchpatch}: stdenv.mkDerivation rec { name = "libxdg-basedir-1.2.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/devnev/libxdg-basedir"; description = "Implementation of the XDG Base Directory specification"; license = licenses.mit; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 467d42ce997..c0785b34e89 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, yacc, doxygen +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, yacc, doxygen , xkeyboard_config, libxcb, libxml2 , python3 , libX11 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { patchShebangs ../test/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to handle keyboard descriptions"; longDescription = '' libxkbcommon is a keyboard keymap compiler and support library which diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index 75043b02e57..cf5f6e320c0 100644 --- a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, yacc, flex, xkeyboard_config, libxcb, libX11 }: +{ lib, stdenv, fetchurl, pkg-config, yacc, flex, xkeyboard_config, libxcb, libX11 }: stdenv.mkDerivation rec { name = "libxkbcommon-0.7.2"; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { "--with-x-locale-root=${libX11.out}/share/X11/locale" ]; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.isDarwin '' sed -i 's/,--version-script=.*$//' Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to handle keyboard descriptions"; homepage = "https://xkbcommon.org"; license = licenses.mit; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 88c3ae60cf3..60b52152f67 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl , glib, isocodes, gobject-introspection }: let @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { "--enable-gtk-doc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library providing high-level API for X Keyboard Extension known as XKB"; homepage = "http://freedesktop.org/wiki/Software/LibXklavier"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix index 6f11d4c461f..600e94d0a75 100644 --- a/pkgs/development/libraries/libxl/default.nix +++ b/pkgs/development/libraries/libxl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libxl"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -rva lib64 $out/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for parsing Excel files"; homepage = "https://www.libxl.com/"; license = licenses.unfree; diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 00300899589..3e8034f8baa 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "libxls"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Extract Cell Data From Excel xls files"; homepage = "https://sourceforge.net/projects/libxls/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index 89b96467155..cc1ae013a0e 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool }: +{ lib, stdenv, fetchurl, libtool }: stdenv.mkDerivation { name = "libxmi-1.2"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { meta = { description = "Library for rasterizing 2-D vector graphics"; homepage = "https://www.gnu.org/software/libxmi/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 182f2d79620..b958f018b60 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , docbook_xml_dtd_43 , docbook_xsl @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to help create and query binary XML blobs"; homepage = "https://github.com/hughsie/libxmlb"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 88f3bec6b95..19282ddc822 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome3 }: stdenv.mkDerivation rec { pname = "libxml++"; version = "2.40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index c01d62989ef..41c842220c7 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, libxml2, glibmm, perl }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl }: stdenv.mkDerivation rec { pname = "libxml++"; version = "3.0.1"; src = fetchurl { - url = "mirror://gnome/sources/libxml++/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/libxml++/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --replace 'docdir=''${datarootdir}' "docdir=$doc/share" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library, version 3"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix index ca4d7edbf32..0b953f95d7e 100644 --- a/pkgs/development/libraries/libxmp/default.nix +++ b/pkgs/development/libraries/libxmp/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libxmp-4.4.1"; - meta = with stdenv.lib; { + meta = with lib; { description = "Extended module player library"; homepage = "http://xmp.sourceforge.net/"; longDescription = '' diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index cf91d7656bf..eff9f2b2b79 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python, libgcrypt +{ lib, stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python, libgcrypt , cryptoSupport ? false , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform }: @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0zrzz6kjdyavspzik6fbkpvfpbd25r2qg6py5nnjaabrsr3bvccq"; }; - outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; + outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py"; buildInputs = [ libxml2.dev ] - ++ stdenv.lib.optional stdenv.isDarwin gettext - ++ stdenv.lib.optionals pythonSupport [ libxml2.py python ] - ++ stdenv.lib.optionals cryptoSupport [ libgcrypt ]; + ++ lib.optional stdenv.isDarwin gettext + ++ lib.optionals pythonSupport [ libxml2.py python ] + ++ lib.optionals cryptoSupport [ libgcrypt ]; propagatedBuildInputs = [ findXMLCatalogs ]; @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { "--without-debug" "--without-mem-debug" "--without-debugger" - ] ++ stdenv.lib.optional pythonSupport "--with-python=${python}" - ++ stdenv.lib.optional (!cryptoSupport) "--without-crypto"; + ] ++ lib.optional pythonSupport "--with-python=${python}" + ++ lib.optional (!cryptoSupport) "--without-crypto"; postFixup = '' moveToOutput bin/xslt-config "$dev" moveToOutput lib/xsltConf.sh "$dev" moveToOutput share/man/man1 "$bin" - '' + stdenv.lib.optionalString pythonSupport '' + '' + lib.optionalString pythonSupport '' mkdir -p $py/nix-support echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs moveToOutput ${python.libPrefix} "$py" @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { inherit pythonSupport; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://xmlsoft.org/XSLT/"; description = "A C library and tools to do XSL transformations"; license = licenses.mit; diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix index 5e4a56a6d4d..a2b4800ec4c 100644 --- a/pkgs/development/libraries/libxsmm/default.nix +++ b/pkgs/development/libraries/libxsmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, gfortran, gnused +{ lib, stdenv, fetchFromGitHub, coreutils, gfortran, gnused , python3, util-linux, which , enableStatic ? stdenv.hostPlatform.isStatic @@ -42,11 +42,11 @@ in stdenv.mkDerivation { patchShebangs . ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives"; license = licenses.bsd3; homepage = "https://github.com/hfp/libxsmm"; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ chessai ]; + maintainers = with lib.maintainers; [ chessai ]; }; } diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index cf880ef1e16..13141923202 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "libyaml-cpp"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A YAML parser and emitter for C++"; license = licenses.mit; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 37b8ebcc3ef..03e7e4715f8 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pyyaml.org/"; description = "A YAML 1.1 parser and emitter written in C"; license = licenses.mit; diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix index 33ece6aed42..6aacfc5ea2f 100644 --- a/pkgs/development/libraries/libykclient/default.nix +++ b/pkgs/development/libraries/libykclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, curl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, curl }: stdenv.mkDerivation { pname = "libykclient"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config help2man ]; buildInputs = [ curl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Yubikey C client library"; homepage = "https://developers.yubico.com/yubico-c-client"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix index 614b66fdea3..a7d35950f03 100644 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, pcsclite, libzip, help2man }: +{ lib, stdenv, fetchurl, pkg-config, pcsclite, libzip, help2man }: stdenv.mkDerivation rec { name = "libykneomgr-0.1.8"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "--with-backend=pcsc" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developers.yubico.com/libykneomgr"; description = "A C library to interact with the CCID-part of the Yubikey NEO"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index 75170d7ff8a..b3aa2b57bdf 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libyubikey-1.13"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "009l3k2zyn06dbrlja2d4p2vfnzjhlcqxi88v02mlrnb17mx1v84"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://opensource.yubico.com/yubico-c/"; description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index 1177196ed18..d16f34039f1 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }: +{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }: stdenv.mkDerivation rec { pname = "libzapojit"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; homepage = "https://wiki.gnome.org/Projects/Zapojit"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index 95f8e78cfb2..986f27e27c8 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, sqlite}: +{lib, stdenv, fetchurl, sqlite}: stdenv.mkDerivation rec { @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { homepage = "http://www.tildeslash.com/libzdb/"; description = "A small, easy to use Open Source Database Connection Pool Library"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index 80a570dd697..2d19ca4b22b 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { version = "0.4.38"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Shared library for libmediainfo and mediainfo"; homepage = "https://mediaarea.net/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 27c046814f3..c65a9b6f583 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, perl, zlib }: +{ lib, stdenv, fetchurl, cmake, perl, zlib }: stdenv.mkDerivation rec { pname = "libzip"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { patchShebangs regress ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nih.at/libzip"; description = "A C library for reading, creating and modifying zip archives"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index a2013604deb..ee19734a0c0 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkg-config, cppunit}: +{lib, stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkg-config, cppunit}: stdenv.mkDerivation rec { pname = "libzmf"; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''A library that parses the file format of Zoner Callisto/Draw documents''; - license = stdenv.lib.licenses.mpl20; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mpl20; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libzmf"; downloadPage = "http://dev-www.libreoffice.org/src/libzmf/"; updateWalker = true; diff --git a/pkgs/development/libraries/libzra/default.nix b/pkgs/development/libraries/libzra/default.nix index 6accf24ac28..3ebfc21095d 100644 --- a/pkgs/development/libraries/libzra/default.nix +++ b/pkgs/development/libraries/libzra/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/zraorg/ZRA"; description = "Library for ZStandard random access"; platforms = platforms.all; diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index 0854987436e..3b57d0c2f7a 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: fetchzip { url = "https://github.com/lief-project/LIEF/releases/download/0.9.0/LIEF-0.9.0-Linux.tar.gz"; sha256 = "1c47hwd00bp4mqd4p5b6xjfl89c3wwk9ccyc3a2gk658250g2la6"; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to Instrument Executable Formats"; homepage = "https://lief.quarkslab.com/"; license = [ licenses.asl20 ]; diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 65d0a18cedd..5fdc06bce01 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, libopcodes }: +{ lib, stdenv, fetchurl, libopcodes }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "lightning"; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.AndersonTorres ]; license = licenses.lgpl3Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index aa34ff2e927..3a16b5202c4 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -4,7 +4,7 @@ , fetchFromGitLab , soci , sqlite -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "End-to-end encryption library for instant messaging"; homepage = "http://www.linphone.org/technical-corner/lime"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 4683f374470..8a21bd3bcde 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , givaro @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-lblas" "--disable-optimization" - ] ++ stdenv.lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2" "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma" "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4" - ] ++ stdenv.lib.optionals withSage [ + ] ++ lib.optionals withSage [ "--enable-sage" ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "C++ library for exact, high-performance linear algebra"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix index 0a2dacb48db..d19d6748147 100644 --- a/pkgs/development/libraries/linenoise-ng/default.nix +++ b/pkgs/development/libraries/linenoise-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "linenoise-ng"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/arangodb/linenoise-ng"; description = "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters"; - maintainers = with stdenv.lib.maintainers; [ cstrahan ]; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.bsd3; + maintainers = with lib.maintainers; [ cstrahan ]; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix index 3de9f08bf97..d465b48a8f4 100644 --- a/pkgs/development/libraries/linenoise/default.nix +++ b/pkgs/development/libraries/linenoise/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "linenoise"; @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/antirez/linenoise"; description = "A minimal, zero-config, BSD licensed, readline replacement"; - maintainers = with stdenv.lib.maintainers; [ mpsyco ]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.bsd2; + maintainers = with lib.maintainers; [ mpsyco ]; + platforms = lib.platforms.unix; + license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index b882e233c07..746771f44fe 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, autoreconfHook }: +{lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation { pname = "liquid-dsp"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { homepage = "https://liquidsdr.org/"; description = "Digital signal processing library for software-defined radios"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix index 21d3bc47663..29531a29996 100644 --- a/pkgs/development/libraries/liquidfun/default.nix +++ b/pkgs/development/libraries/liquidfun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }: +{ lib, stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }: let sourceInfo = rec { @@ -36,13 +36,13 @@ stdenv.mkDerivation { meta = { description = "2D physics engine based on Box2D"; - maintainers = with stdenv.lib.maintainers; + maintainers = with lib.maintainers; [ qknight ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; hydraPlatforms = []; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; homepage = "https://google.github.io/liquidfun/"; }; } diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 9184c7330ed..6b7f0c102ee 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, help2man, python3, +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, help2man, python3, alsaLib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "localstatedir=$TMPDIR" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows to receive and send infrared signals"; homepage = "https://www.lirc.org/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 84907a42860..85302bc7c96 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sed \ -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \ -i config.linux - '' + stdenv.lib.optionalString (stdenv ? glibc) '' + '' + lib.optionalString (stdenv ? glibc) '' substituteInPlace liveMedia/include/Locale.hh \ --replace '' '' ''; diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 64f6fccefa7..a59b460734d 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "lmdb"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" ] - ++ stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so"; + ++ lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so"; doCheck = true; checkPhase = "make test"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { EOF ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightning memory-mapped database"; longDescription = '' LMDB is an ultra-fast, ultra-compact key-value embedded data store diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix index 95d8f45eec4..9b1d320678a 100644 --- a/pkgs/development/libraries/lmdbxx/default.nix +++ b/pkgs/development/libraries/lmdbxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , lmdb }: @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/drycpp/lmdbxx#readme"; description = "C++11 wrapper for the LMDB embedded B+ tree database library"; - license = stdenv.lib.licenses.unlicense; - maintainers = with stdenv.lib.maintainers; [ fgaz ]; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ fgaz ]; }; } diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 097ff0c48c9..1e16ee96ae7 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let name = "log4cplus-2.0.5"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { homepage = "http://log4cplus.sourceforge.net/"; description = "A port the log4j library from Java to C++"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index d2918c87f33..d4b703a2bda 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "log4cpp-1.1.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://log4cpp.sourceforge.net/"; description = "A logging framework for C++ patterned after Apache log4j"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index cec0ec9ab28..aaf7ea5ee9c 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, libxml2, cppunit, boost +{ lib, stdenv, fetchurl, libtool, libxml2, cppunit, boost , apr, aprutil, db, expat }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }' src/examples/cpp/console.cpp \ src/main/cpp/inputstreamreader.cpp \ src/main/cpp/socketoutputstream.cpp - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed -i 's/namespace std { class locale; }/#include /' src/main/include/log4cxx/helpers/simpledateformat.h sed -i 's/\(#include \)/\1\n#include /' src/main/cpp/stringhelper.cpp ''; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://logging.apache.org/log4cxx/index.html"; description = "A logging framework for C++ patterned after Apache log4j"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index 17046d17b78..0602b4c3b52 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook }: +{ lib, stdenv, fetchgit, autoreconfHook }: stdenv.mkDerivation { pname = "log4shib"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A forked version of log4cpp that has been created for the Shibboleth project"; maintainers = [ maintainers.jammerful ]; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix index 9c7e36113d8..49b850eae65 100644 --- a/pkgs/development/libraries/loki/default.nix +++ b/pkgs/development/libraries/loki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "loki"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ library of designs, containing flexible implementations of common design patterns and idioms"; homepage = "http://loki-lib.sourceforge.net"; license = licenses.mit; diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index de2f1b7c5c3..0245417bbf9 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib }: +{ lib, stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib }: stdenv.mkDerivation rec { version = "1.5.3"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight C library for the Jabber protocol"; platforms = platforms.linux; downloadPage = "http://mcabber.com/files/loudmouth/"; diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/development/libraries/lrdf/default.nix index b37749385ba..51b2635b89e 100644 --- a/pkgs/development/libraries/lrdf/default.nix +++ b/pkgs/development/libraries/lrdf/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchFromGitHub, pkg-config, autoreconfHook +{ config, lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , librdf_raptor2, ladspaH, openssl, zlib , doCheck ? config.doCheckByDefault or false, ladspaPlugins }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "00wzkfb8y0aqd519ypz067cq099dpc89w69zw8ln39vl6f9x2pd4"; }; - postPatch = stdenv.lib.optionalString doCheck '' + postPatch = lib.optionalString doCheck '' sed -i -e 's:usr/local:${ladspaPlugins}:' examples/{instances,remove}_test.c ''; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight RDF library with special support for LADSPA plugins"; homepage = "https://sourceforge.net/projects/lrdf/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index eded6b6527f..d7aed656fdb 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost-build, lua, boost}: +{lib, stdenv, fetchurl, boost-build, lua, boost}: stdenv.mkDerivation { name = "luabind-0.9.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/luabind/luabind"; description = "A library that helps you create bindings between C++ and Lua"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 0dcd53a0772..2761329ea23 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost, gtest }: +{ lib, stdenv, fetchurl, cmake, boost, gtest }: stdenv.mkDerivation rec { pname = "lucene++"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ port of the popular Java Lucene search engine"; homepage = "https://github.com/luceneplusplus/LucenePlusPlus"; - license = with stdenv.lib.licenses; [ asl20 lgpl3Plus ]; - platforms = stdenv.lib.platforms.linux; + license = with lib.licenses; [ asl20 lgpl3Plus ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix index 8d5d083d82b..9f5fd1d3a34 100644 --- a/pkgs/development/libraries/lyra/default.nix +++ b/pkgs/development/libraries/lyra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, installShellFiles, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, meson, ninja }: stdenv.mkDerivation rec { pname = "lyra"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp -R $src/include/* $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bfgroup/Lyra"; description = "A simple to use, composable, command line parser for C++ 11 and beyond"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index 446f9146414..8ea933f0e3a 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "lzo-2.10"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = true; # not cross; - meta = with stdenv.lib; { + meta = with lib; { description = "Real-time data (de)compression library"; longDescription = '' LZO is a portable lossless data compression library written in ANSI C. diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix index a896b9261d5..7445d283c6f 100644 --- a/pkgs/development/libraries/mac/default.nix +++ b/pkgs/development/libraries/mac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, yasm }: +{ lib, stdenv, fetchurl, fetchpatch, yasm }: stdenv.mkDerivation rec { pname = "mac"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ yasm ]; - meta = with stdenv.lib; { + meta = with lib; { description = "APE codec and decompressor"; homepage = "http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"; license = licenses.unfreeRedistributable; diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index 49ffade8546..641f3b87c3f 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , fetchpatch , meson @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { # We need to install Polkit & AccountsService data files in `out` # but `buildEnv` only uses `bin` when both `bin` and `out` are present. outputsToInstall = [ "bin" "out" "man" ]; diff --git a/pkgs/development/libraries/malcontent/ui.nix b/pkgs/development/libraries/malcontent/ui.nix index 54382cfc0d5..e306267154a 100644 --- a/pkgs/development/libraries/malcontent/ui.nix +++ b/pkgs/development/libraries/malcontent/ui.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , meson , ninja , pkg-config @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { "-Dui=enabled" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "UI components for parental controls library"; homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index cf0539fe266..40ef1fde563 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip +{ lib, stdenv, fetchzip , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff , libwebp, libxml2, proj, python, sqlite, zlib @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { "XML2_LIBS=${libxml2.out}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source toolkit for developing mapping applications"; homepage = "https://mapnik.org"; maintainers = with maintainers; [ hrdinka ]; diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/development/libraries/marisa/default.nix index 99d82970fe0..4a3f8be0417 100644 --- a/pkgs/development/libraries/marisa/default.nix +++ b/pkgs/development/libraries/marisa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "marisa"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/s-yata/marisa-trie"; description = "Static and space-efficient trie data structure library"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/marl/default.nix b/pkgs/development/libraries/marl/default.nix index 2bf23962d53..4545264aad9 100644 --- a/pkgs/development/libraries/marl/default.nix +++ b/pkgs/development/libraries/marl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ lib, stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "marl"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Turn on the flag to install after building the library. cmakeFlags = ["-DMARL_INSTALL=ON"]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/google/marl"; description = "A hybrid thread / fiber task scheduler written in C++ 11"; platforms = platforms.all; diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 46f95148d82..609033e22ea 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ant, jdk}: +{lib, stdenv, fetchurl, ant, jdk}: stdenv.mkDerivation rec { pname = "martyr"; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; homepage = "http://martyr.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index bc629dc2506..b6330f69e30 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "matio-1.5.19"; src = fetchurl { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { sha256 = "0vr8c1mz1k6mz0sgh6n3scl5c3a71iqmy5fnydrgq504icj4vym4"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library for reading and writing Matlab MAT files"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index f24232ac7ae..e3e0d2ecd78 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja perl python ]; - postConfigure = stdenv.lib.optionals enableThreading '' + postConfigure = lib.optionals enableThreading '' perl scripts/config.pl set MBEDTLS_THREADING_C # Threading abstraction layer perl scripts/config.pl set MBEDTLS_THREADING_PTHREAD # POSIX thread wrapper layer for the threading layer. ''; cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tls.mbed.org/"; description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; license = licenses.asl20; diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index b69e99de414..0fc74963299 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, llvmPackages }: +{ lib, stdenv, fetchurl, boost, llvmPackages }: stdenv.mkDerivation rec { pname = "mdds"; @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" ''; - buildInputs = stdenv.lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; + buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; checkInputs = [ boost ]; - meta = with stdenv.lib; { + meta = with lib; { inherit version; homepage = "https://gitlab.com/mdds/mdds"; description = "A collection of multi-dimensional data structure and indexing algorithm"; diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 4821b9865b2..a89cb43d261 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, hdf5 }: +{ lib, stdenv, fetchurl, cmake, hdf5 }: stdenv.mkDerivation rec { pname = "medfile"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postInstall = "rm -r $out/bin/testc"; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to read and write MED files"; homepage = "http://salome-platform.org/"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index a4d4f408f90..3cda9ff3006 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -28,7 +28,7 @@ , SDL , speex , srtp -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { ]; NIX_LDFLAGS = "-lXext"; - meta = with stdenv.lib; { + meta = with lib; { description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications"; homepage = "http://www.linphone.org/technical-corner/mediastreamer2"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 527c395963f..08842889f86 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -5,7 +5,7 @@ , mediastreamer , openh264 , pkg-config -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { cp src/libmsopenh264.so $out/lib/mediastreamer/plugins/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "H.264 encoder/decoder plugin for mediastreamer2"; homepage = "https://www.linphone.org/technical-corner/mediastreamer2"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index 36e3c8c6700..b2f06b9e627 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkg-config, libfm-extra }: +{ lib, stdenv, fetchurl, glib, pkg-config, libfm-extra }: let name = "menu-cache-1.1.0"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ glib libfm-extra ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to read freedesktop.org menu files"; homepage = "https://blog.lxde.org/tag/menu-cache/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 1f42828907a..85950daea68 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libGL, ApplicationServices }: +{ lib, stdenv, fetchurl, pkg-config, libGL, ApplicationServices }: stdenv.mkDerivation rec { pname = "glu"; @@ -11,15 +11,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libGL ] - ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; + ++ lib.optional stdenv.isDarwin ApplicationServices; outputs = [ "out" "dev" ]; meta = { description = "OpenGL utility library"; homepage = "https://cgit.freedesktop.org/mesa/glu/"; - license = stdenv.lib.licenses.sgi-b-20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.sgi-b-20; + platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isAndroid; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 217aff58966..44dddac7d32 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -26,7 +26,7 @@ - libOSMesa is in $osmesa (~4 MB) */ -with stdenv.lib; +with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html @@ -207,7 +207,7 @@ stdenv.mkDerivation { done ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-fno-common"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-common"; passthru = { inherit libdrm; diff --git a/pkgs/development/libraries/metal/default.nix b/pkgs/development/libraries/metal/default.nix index 090fd46640e..18b1f116b87 100644 --- a/pkgs/development/libraries/metal/default.nix +++ b/pkgs/development/libraries/metal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "metal"; version = "2.1.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Single-header C++11 library designed to make you love template metaprogramming"; homepage = "https://github.com/brunocodutra/metal"; license = licenses.mit; diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix index a0356497818..af1c1c91a94 100644 --- a/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/pkgs/development/libraries/microsoft_gsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, catch, cmake +{ lib, stdenv, fetchFromGitHub, catch, cmake }: let @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mv ../include/ $out/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ Core Guideline support library"; longDescription = '' The Guideline Support Library (GSL) contains functions and types that are suggested for diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index fcc44062b51..2ac2087054f 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ninja +{ lib, stdenv, fetchFromGitHub, cmake, ninja , secureBuild ? false }: @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ninja ]; - cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ]; + cmakeFlags = lib.optional secureBuild [ "-DMI_SECURE=ON" ]; postInstall = let - rel = stdenv.lib.versions.majorMinor version; + rel = lib.versions.majorMinor version; in '' # first, install headers, that's easy mkdir -p $dev @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Compact, fast, general-purpose memory allocator"; homepage = "https://github.com/microsoft/mimalloc"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix index 0147a297305..1638caa0d1f 100644 --- a/pkgs/development/libraries/mimetic/default.nix +++ b/pkgs/development/libraries/mimetic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cutee }: +{ lib, stdenv, fetchurl, cutee }: stdenv.mkDerivation rec { pname = "mimetic"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ cutee ]; - patches = stdenv.lib.optional stdenv.isAarch64 ./narrowing.patch; + patches = lib.optional stdenv.isAarch64 ./narrowing.patch; - meta = with stdenv.lib; { + meta = with lib; { description = "MIME handling library"; homepage = "http://www.codesink.org/mimetic_mime_library.html"; license = licenses.mit; diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix index d1804b9bf95..e48857861d6 100644 --- a/pkgs/development/libraries/miniball/default.nix +++ b/pkgs/development/libraries/miniball/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { pname = "miniball"; @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { description = "Smallest Enclosing Balls of Points"; homepage = "https://www.inf.ethz.ch/personal/gaertner/miniball.html"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.erikryb ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.erikryb ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index 8938ab90fbc..93c03b31a8a 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mxml"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A small XML library"; homepage = "https://www.msweet.org/mxml/"; license = licenses.asl20; diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index 5ee1f38ca8b..bb62a9b3b2b 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, zlib, autoreconfHook }: +{ lib, stdenv, zlib, autoreconfHook }: stdenv.mkDerivation { name = "minizip-${zlib.version}"; @@ -12,6 +12,6 @@ stdenv.mkDerivation { meta = { description = "Compression library implementing the deflate compression method found in gzip and PKZIP"; inherit (zlib.meta) license homepage; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/minizip2/default.nix b/pkgs/development/libraries/minizip2/default.nix index 6c6d8b3ef86..16bb2b8d44e 100644 --- a/pkgs/development/libraries/minizip2/default.nix +++ b/pkgs/development/libraries/minizip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, zlib, bzip2, xz, zstd, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, bzip2, xz, zstd, openssl }: stdenv.mkDerivation rec { pname = "minizip"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 xz zstd openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Compression library implementing the deflate compression method found in gzip and PKZIP"; homepage = "https://github.com/nmoinvaz/minizip"; license = licenses.zlib; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 7423c0e5c77..633a7325b09 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif , libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 , gtk2, genericUpdater, common-updater-scripts, libebur128 @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { rev-prefix = "v"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source multimedia framework, designed for television broadcasting"; homepage = "https://www.mltframework.org"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 599209fa57d..7004a5e11c0 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , SDL , ffmpeg @@ -23,7 +23,7 @@ , mkDerivation , which }: -let inherit (stdenv.lib) getDev; in +let inherit (lib) getDev; in mkDerivation rec { pname = "mlt"; version = "6.22.1"; @@ -102,7 +102,7 @@ mkDerivation rec { rev-prefix = "v"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source multimedia framework, designed for television broadcasting"; homepage = "https://www.mltframework.org/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index 3981e05ef06..a43d99503a3 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , gnome3 , meson @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "1.0.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "07b4s5ckcz9q5gwx8vchim19mhfgl8wysqwi30pndks3m4zrzad2"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Common build files of GLib/GTK C++ bindings"; longDescription = '' The mm-common module provides the build infrastructure and utilities diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 523de7cc6bf..e9779cf0a05 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, perl, pkg-config, libbson +{ lib, stdenv, fetchzip, perl, pkg-config, libbson , openssl, which, zlib, snappy }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The official C client library for MongoDB"; homepage = "https://github.com/mongodb/mongo-c-driver"; license = licenses.asl20; diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index 672d29e20f4..158b39a8186 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono4, gtk-sharp-2_0 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono4, gtk-sharp-2_0 }: stdenv.mkDerivation rec { pname = "mono-addins"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.mono-project.com/archived/monoaddins/"; description = "A generic framework for creating extensible applications"; longDescription = '' diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index 144f11355e1..0499aaec532 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libtool +{ lib, stdenv, fetchurl, pkg-config, libtool , xlibsWrapper, xbitmaps, libXrender, libXmu, libXt , expat, libjpeg, libpng, libiconv , flex @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { prePatch = '' rm lib/Xm/Xm.h - '' + stdenv.lib.optionalString (!demoSupport) '' + '' + lib.optionalString (!demoSupport) '' sed '/^SUBDIRS =,^$/s/\//' -i Makefile.{am,in} ''; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ./Add-X.Org-to-bindings-file.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://motif.ics.com"; description = "Unix standard widget-toolkit and window-manager"; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 3201de460ff..9c03a9f6c49 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkg-config }: +{ lib, stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkg-config }: stdenv.mkDerivation rec { pname = "movit"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "High-performance, high-quality video filters for the GPU"; homepage = "https://movit.sesse.net"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index 3b8efadcfd1..7a6bbb55202 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libmp4v2-c++11.patch?id=203f5a72bc97ffe089b424c47b07dd9eaea35713"; sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w"; }) - ] ++ stdenv.lib.optionals stdenv.cc.isClang [ + ] ++ lib.optionals stdenv.cc.isClang [ # unbreak build with Clang≥6 (C++14 by default). Based on https://reviews.freebsd.org/rP458678 ./fix-build-clang.patch ]; diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index 88617e9a740..5a43fb107ad 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, mpfr}: +{lib, stdenv, fetchurl, mpfr}: stdenv.mkDerivation rec { pname = "mpfi"; version = "1.5.3"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { inherit version; description = ''A multiple precision interval arithmetic library based on MPFR''; homepage = "https://gforge.inria.fr/projects/mpfi/"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 4a744b7483e..fc7eeeab942 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp }: +{ lib, stdenv, fetchurl, gmp }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gmp ]; configureFlags = - stdenv.lib.optional stdenv.hostPlatform.isSunOS "--disable-thread-safe" ++ - stdenv.lib.optional stdenv.hostPlatform.is64bit "--with-pic"; + lib.optional stdenv.hostPlatform.isSunOS "--disable-thread-safe" ++ + lib.optional stdenv.hostPlatform.is64bit "--with-pic"; doCheck = true; # not cross; @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { floating-point arithmetic (53-bit mantissa). ''; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 0c1ea8be1c8..f7cdf7f97c0 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gfortran +{ lib, stdenv, fetchurl, perl, gfortran , openssh, hwloc } : @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort '' - + stdenv.lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.isDarwin) '' # /tmp/nix-build... ends up in the RPATH, fix it manually for entry in $out/bin/mpichversion $out/bin/mpivars; do echo "fix rpath: $entry" @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Implementation of the Message Passing Interface (MPI) standard"; longDescription = '' diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index 8da59530ea5..7f1374df280 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, which, yasm }: +{ lib, stdenv, fetchurl, m4, which, yasm }: stdenv.mkDerivation rec { pname = "mpir"; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''A highly optimised library for bignum arithmetic forked from GMP''; - license = stdenv.lib.licenses.lgpl3Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl3Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; downloadPage = "http://mpir.org/downloads.html"; homepage = "http://mpir.org/"; updateWalker = true; diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index 8c1f3aea466..81b102d9bc3 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, sqlite }: +{ lib, stdenv, fetchurl, autoreconfHook, sqlite }: stdenv.mkDerivation rec { pname = "mps"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "A flexible memory management and garbage collection library"; homepage = "https://www.ravenbrook.com/project/mps"; - license = stdenv.lib.licenses.sleepycat; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.sleepycat; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index d7d79de8b2b..a784bc02636 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake +{ lib, stdenv, cmake , version, src, patches ? [ ] , ... }: @@ -11,9 +11,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - cmakeFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DMSGPACK_BUILD_EXAMPLES=OFF"; + cmakeFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DMSGPACK_BUILD_EXAMPLES=OFF"; - meta = with stdenv.lib; { + meta = with lib; { description = "MessagePack implementation for C and C++"; homepage = "https://msgpack.org"; license = licenses.asl20; diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix index 0411a8bf623..e65b7453dc3 100644 --- a/pkgs/development/libraries/msgpuck/default.nix +++ b/pkgs/development/libraries/msgpuck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "msgpuck"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = ''A simple and efficient MsgPack binary serialization library in a self-contained header file''; homepage = "https://github.com/rtsisyk/msgpuck"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix index c388a291cc5..cdcc0548abb 100644 --- a/pkgs/development/libraries/msilbc/default.nix +++ b/pkgs/development/libraries/msilbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ilbc, mediastreamer, pkg-config }: +{ lib, stdenv, fetchurl, ilbc, mediastreamer, pkg-config }: stdenv.mkDerivation rec { name = "msilbc-2.1.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "MEDIASTREAMER_LIBS=mediastreamer" "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Mediastreamer plugin for the iLBC audio codec"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index 5c04c6a6942..7873608e589 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "mtdev-1.1.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://bitmath.org/code/mtdev/"; description = "Multitouch Protocol Translation Library"; longDescription = '' diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 72f8477c872..38c95a5a19f 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { olm ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Client API library for Matrix, built on top of Boost.Asio"; homepage = "https://github.com/Nheko-Reborn/mtxclient"; license = licenses.mit; diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/development/libraries/multipart-parser-c/default.nix index b2bdf5d0447..45b0abdee71 100644 --- a/pkgs/development/libraries/multipart-parser-c/default.nix +++ b/pkgs/development/libraries/multipart-parser-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Http multipart parser implemented in C "; homepage = "https://github.com/iafonov/multipart-parser-c"; - license = [ stdenv.lib.licenses.mit ]; + license = [ lib.licenses.mit ]; }; } diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix index 8aac20e19d0..b1951bdb226 100644 --- a/pkgs/development/libraries/muparser/default.nix +++ b/pkgs/development/libraries/muparser/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, unzip, setfile}: +{lib, stdenv, fetchurl, unzip, setfile}: stdenv.mkDerivation rec { pname = "muparser"; version = "2.2.3"; - url-version = stdenv.lib.replaceChars ["."] ["_"] version; + url-version = lib.replaceChars ["."] ["_"] version; src = fetchurl { url = "mirror://sourceforge/muparser/muparser_v${url-version}.zip"; @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { buildInputs = [ unzip - ] ++ stdenv.lib.optionals stdenv.isDarwin [setfile]; + ] ++ lib.optionals stdenv.isDarwin [setfile]; meta = { homepage = "http://muparser.sourceforge.net"; description = "An extensible high performance math expression parser library written in C++"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.mit; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/muparserx/default.nix b/pkgs/development/libraries/muparserx/default.nix index d7de5ff00f3..ef6b254b8a3 100644 --- a/pkgs/development/libraries/muparserx/default.nix +++ b/pkgs/development/libraries/muparserx/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { fi ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ Library for Parsing Expressions with Strings, Complex Numbers, Vectors, Matrices and more"; homepage = "https://beltoforion.de/en/muparserx/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix index ae40ab9f895..9470b812586 100644 --- a/pkgs/development/libraries/mutest/default.nix +++ b/pkgs/development/libraries/mutest/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , meson , ninja @@ -24,7 +24,7 @@ stdenv.mkDerivation { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ebassi.github.io/mutest/mutest.md.html"; description = "A BDD testing framework for C, inspired by Mocha"; license = licenses.mit; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 4b86868d2aa..4260e30561b 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid, +{ lib, stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid, boost, pkg-config, withOgre ? false, ogre ? null, libGL, libGLU ? null } : let @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { # Tools are disabled due to compilation failures. cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mygui.info/"; description = "Library for creating GUIs for games and 3D applications"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix index 07a57c66480..73acfd9287f 100644 --- a/pkgs/development/libraries/mypaint-brushes/1.0.nix +++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoconf , automake , fetchFromGitHub @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mypaint.org/"; description = "Brushes used by MyPaint and other software using libmypaint"; license = licenses.cc0; diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix index 08ac20e447c..acdee52b85e 100644 --- a/pkgs/development/libraries/mypaint-brushes/default.nix +++ b/pkgs/development/libraries/mypaint-brushes/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoconf , automake , fetchFromGitHub @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mypaint.org/"; description = "Brushes used by MyPaint and other software using libmypaint"; license = licenses.cc0; diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 1e2e3982d55..3b5da68a59d 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation { name = "mysocketw-031026"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ openssl ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/Makefile \ --replace -Wl,-soname, -Wl,-install_name,$out/lib/ ''; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix index b4983455675..b678baf9881 100644 --- a/pkgs/development/libraries/mythes/default.nix +++ b/pkgs/development/libraries/mythes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, hunspell, ncurses, pkg-config, perl }: +{ lib, stdenv, fetchurl, hunspell, ncurses, pkg-config, perl }: stdenv.mkDerivation rec { name = "mythes-1.2.4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://hunspell.sourceforge.net/"; description = "Thesaurus library from Hunspell project"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; inherit (hunspell.meta) platforms; }; } diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index 649ce91cbd8..0dbbd461dc2 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake}: +{lib, stdenv, fetchFromGitHub, cmake}: stdenv.mkDerivation rec { version = "1.3.2"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/jlblancoc/nanoflann"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; description = "Header only C++ library for approximate nearest neighbor search"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index 5772581d5ec..49a93abd7fb 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ lib, stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { version = "1.1.5"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description= "Socket library that provides several common communication patterns"; homepage = "https://nanomsg.org/"; license = licenses.mit; diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index bb8dee2be61..e8053ce2702 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: +{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: stdenv.mkDerivation rec { version = "4.9.7"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { description = "NetCDF Operator toolkit"; longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5"; homepage = "http://nco.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.bzizou ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix index c0e1816c0e1..75d2a2db021 100644 --- a/pkgs/development/libraries/ndi/default.nix +++ b/pkgs/development/libraries/ndi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, avahi }: +{ lib, stdenv, requireFile, avahi }: stdenv.mkDerivation rec { pname = "ndi"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # Stripping breaks ndi-record. dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ndi.tv/sdk/"; description = "NDI Software Developer Kit"; platforms = ["x86_64-linux"]; diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index 893f82a6d52..f2510d6f6bb 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , doxygen , pkg-config @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "--boost-libs=${boost.out}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://named-data.net/"; description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; longDescription = '' diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index 43da97c2edd..c3df23052e2 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap +{ lib, stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap , pkg-config }: let version = "3.4"; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for deep-packet inspection"; longDescription = '' nDPI is a library for deep-packet inspection based on OpenDPI. diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index a6b6e88cec3..5e02a9fd522 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, readline, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, readline, makeWrapper }: stdenv.mkDerivation { name = "neardal-0.7-post-git-20150930"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { configureFlags = [ "--disable-dependency-tracking" "--disable-traces" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C APIs to exchange datas with the NFC daemon 'Neard'"; license = licenses.lgpl2; homepage = "https://01.org/linux-nfc"; diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index db7940536f1..980424b7fd4 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, pkg-config, ninja +{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja , pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson pkg-config ninja ]; buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A VNC server library"; longDescription = '' This is a liberally licensed VNC server library that's intended to be diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index 89b48221ca8..e0437fb7cea 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, pkg-config, perl +{ lib, stdenv, fetchurl, libxml2, pkg-config, perl , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? false @@ -10,7 +10,7 @@ assert sslSupport -> openssl != null; assert static || shared; let - inherit (stdenv.lib) optionals; + inherit (lib) optionals; in stdenv.mkDerivation rec { @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [libxml2 openssl] - ++ stdenv.lib.optional compressionSupport zlib; + ++ lib.optional compressionSupport zlib; configureFlags = [ - (stdenv.lib.enableFeature shared "shared") - (stdenv.lib.enableFeature static "static") - (stdenv.lib.withFeature compressionSupport "zlib") - (stdenv.lib.withFeature sslSupport "ssl") + (lib.enableFeature shared "shared") + (lib.enableFeature static "static") + (lib.withFeature compressionSupport "zlib") + (lib.withFeature sslSupport "ssl") ]; passthru = {inherit compressionSupport sslSupport;}; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails, needs the net - meta = with stdenv.lib; { + meta = with lib; { description = "An HTTP and WebDAV client library"; homepage = "http://www.webdav.org/neon/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 935a17d3d78..c0c62deb0ac 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, pkg-config, perl +{ lib, stdenv, fetchurl, libxml2, pkg-config, perl , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? stdenv.hostPlatform.isStatic @@ -10,7 +10,7 @@ assert sslSupport -> openssl != null; assert static || shared; let - inherit (stdenv.lib) optionals; + inherit (lib) optionals; in stdenv.mkDerivation rec { @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [libxml2 openssl] - ++ stdenv.lib.optional compressionSupport zlib; + ++ lib.optional compressionSupport zlib; configureFlags = [ - (stdenv.lib.enableFeature shared "shared") - (stdenv.lib.enableFeature static "static") - (stdenv.lib.withFeature compressionSupport "zlib") - (stdenv.lib.withFeature sslSupport "ssl") + (lib.enableFeature shared "shared") + (lib.enableFeature static "static") + (lib.withFeature compressionSupport "zlib") + (lib.withFeature sslSupport "ssl") ]; passthru = {inherit compressionSupport sslSupport;}; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails, needs the net - meta = with stdenv.lib; { + meta = with lib; { description = "An HTTP and WebDAV client library"; homepage = "http://www.webdav.org/neon/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index 526e02e8907..b594a672140 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, netcdf, hdf5, curl }: +{ lib, stdenv, fetchurl, netcdf, hdf5, curl }: stdenv.mkDerivation rec { pname = "netcdf-cxx4"; version = "4.3.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ API to manipulate netcdf files"; homepage = "https://www.unidata.ucar.edu/software/netcdf/"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.free; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index ab10c686163..0cdeda23879 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, netcdf, hdf5, curl, gfortran }: +{ lib, stdenv, fetchurl, netcdf, hdf5, curl, gfortran }: stdenv.mkDerivation rec { pname = "netcdf-fortran"; version = "4.4.5"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ netcdf hdf5 curl gfortran ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Fortran API to manipulate netcdf files"; homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = licenses.free; diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index fecc4100f5e..c345f66e872 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , hdf5 , m4 @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { "--enable-shared" "--disable-dap-remote-tests" ] - ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]); + ++ (lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]); disallowedReferences = [ stdenv.cc ]; @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { meta = { description = "Libraries for the Unidata network Common Data Format"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = { url = "https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html"; diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index 4c3c6d04ca8..735fe373533 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, gmp, gnum4 +{ lib, stdenv, buildPackages, gmp, gnum4 # Version specific args , version, src @@ -22,10 +22,10 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; - patches = stdenv.lib.optional (stdenv.hostPlatform.system == "i686-cygwin") + patches = lib.optional (stdenv.hostPlatform.system == "i686-cygwin") ./cygwin.patch; - meta = with stdenv.lib; { + meta = with lib; { description = "Cryptographic library"; longDescription = '' @@ -61,7 +61,7 @@ stdenv.mkDerivation ({ // -stdenv.lib.optionalAttrs stdenv.isSunOS { +lib.optionalAttrs stdenv.isSunOS { # Make sure the right is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See # diff --git a/pkgs/development/libraries/networking-ts-cxx/default.nix b/pkgs/development/libraries/networking-ts-cxx/default.nix index 72981175c0b..7dc6d4b11fe 100644 --- a/pkgs/development/libraries/networking-ts-cxx/default.nix +++ b/pkgs/development/libraries/networking-ts-cxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "networking-ts-cxx"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { substituteAll ${./networking_ts.pc.in} $out/lib/pkgconfig/networking_ts.pc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Experimental implementation of the C++ Networking Technical Specification"; homepage = "https://github.com/chriskohlhoff/networking-ts-impl"; license = licenses.boost; diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 41d9671b204..dc6b604bd8e 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { unset CPP ''; - makeFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fedorahosted.org/newt/"; description = "Library for color text mode, widget based user interfaces"; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 0ec941ff182..6464679b948 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, pkg-config # Optional Dependencies , openssl ? null, zlib ? null @@ -23,7 +23,7 @@ assert enableGetAssets -> libxml2 != null; assert enableJemalloc -> jemalloc != null; assert enablePython -> python != null && cython != null && ncurses != null && setuptools != null; -let inherit (stdenv.lib) optional optionals optionalString; in +let inherit (lib) optional optionals optionalString; in stdenv.mkDerivation rec { pname = "nghttp2"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-spdylay=no" "--disable-examples" - (stdenv.lib.enableFeature enableApp "app") + (lib.enableFeature enableApp "app") ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib" ++ (if enablePython then [ "--with-cython=${cython}/bin/cython" @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://nghttp2.org/"; description = "A C implementation of HTTP/2"; license = licenses.mit; diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/development/libraries/ngt/default.nix index 7d766eb5d87..385f2d84f8a 100644 --- a/pkgs/development/libraries/ngt/default.nix +++ b/pkgs/development/libraries/ngt/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , llvmPackages @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { NIX_ENFORCE_NO_NATIVE = ! enableAVX; __AVX2__ = if enableAVX then 1 else 0; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/yahoojapan/NGT"; description = "Nearest Neighbor Search with Neighborhood Graph and Tree for High-dimensional Data"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 94c4bd84d9a..915e733473e 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nix, cmake, pkg-config, boost }: +{ lib, stdenv, fetchFromGitHub, nix, cmake, pkg-config, boost }: let version = "6.0.0"; in stdenv.mkDerivation { pname = "nix-plugins"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Collection of miscellaneous plugins for the nix expression language"; homepage = "https://github.com/shlevy/nix-plugins"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 34c0f6294af..74213534532 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/lib64"; - meta = with stdenv.lib; { + meta = with lib; { description = "Header only C++ library for the JSON file format"; homepage = "https://github.com/nlohmann/json"; license = licenses.mit; diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index 64eb6d79abd..36fcf908118 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, octave ? null }: +{ lib, stdenv, fetchFromGitHub, cmake, octave ? null }: stdenv.mkDerivation rec { pname = "nlopt"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--without-guile" "--without-python" "--without-matlab" - ] ++ stdenv.lib.optionals (octave != null) [ + ] ++ lib.optionals (octave != null) [ "--with-octave" "M_INSTALL_DIR=$(out)/${octave.sitePath}/m" "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct" @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://nlopt.readthedocs.io/en/latest/"; description = "Free open-source library for nonlinear optimization"; - license = stdenv.lib.licenses.lgpl21Plus; - hydraPlatforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + hydraPlatforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix index a1a7a9ad6cb..1cd69074911 100644 --- a/pkgs/development/libraries/notify-sharp/default.nix +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkg-config, autoreconfHook +{ lib, stdenv, fetchFromGitLab, pkg-config, autoreconfHook , mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sed -i 's#^[ \t]*DOCDIR=.*$#DOCDIR=$out/lib/monodoc#' ./configure.ac ''; - meta = with stdenv.lib; { + meta = with lib; { description = "D-Bus for .NET"; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix index c3ef724501e..6611f99bdfc 100644 --- a/pkgs/development/libraries/npapi-sdk/default.nix +++ b/pkgs/development/libraries/npapi-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "npapi-sdk"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0xxfcsjmmgbbyl9zwpzdshbx27grj5fnzjfmldmm9apws2yk9gq1"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A bundle of NPAPI headers by Mozilla"; homepage = "https://bitbucket.org/mgorny/npapi-sdk"; # see also https://github.com/mozilla/npapi-sdk diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index 51512a16057..a5ac9ce9912 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "npth-1.6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The New GNU Portable Threads Library"; longDescription = '' This is a library to provide the GNU Pth API and thus a non-preemptive diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index e8893bc2040..17b8b9226d5 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , CoreServices ? null , buildPackages }: @@ -22,7 +22,7 @@ stdenv.mkDerivation { preConfigure = '' cd nspr - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace '@executable_path/' "$out/lib/" substituteInPlace configure.in --replace '@executable_path/' "$out/lib/" ''; @@ -32,18 +32,18 @@ stdenv.mkDerivation { configureFlags = [ "--enable-optimize" "--disable-debug" - ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit"; + ] ++ lib.optional stdenv.is64bit "--enable-64bit"; postInstall = '' find $out -name "*.a" -delete moveToOutput share "$dev" # just aclocal ''; - buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = [] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.mozilla.org/projects/nspr/"; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; platforms = platforms.all; diff --git a/pkgs/development/libraries/nss/3.44.nix b/pkgs/development/libraries/nss/3.44.nix index 1c89dd79331..b08b8b3ed2a 100644 --- a/pkgs/development/libraries/nss/3.44.nix +++ b/pkgs/development/libraries/nss/3.44.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }: +{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }: let nssPEM = fetchurl { @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ zlib sqlite ]; @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" ''; @@ -61,16 +61,16 @@ in stdenv.mkDerivation rec { "USE_SYSTEM_ZLIB=1" "NSS_USE_SYSTEM_SQLITE=1" "NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc" - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ # Pass in CPU even if we're not cross compiling, because otherwise it tries to guess with # uname, which can be wrong if e.g. we're compiling for aarch32 on aarch64 "OS_TEST=${cpu}" "CPU_ARCH=${cpu}" - ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=1" "NSS_DISABLE_GTESTS=1" # don't want to build tests when cross-compiling - ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1" - ++ stdenv.lib.optional stdenv.isDarwin "CCC=clang++"; + ] ++ lib.optional stdenv.is64bit "USE_64=1" + ++ lib.optional stdenv.isDarwin "CCC=clang++"; NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -135,7 +135,7 @@ in stdenv.mkDerivation rec { rm -f "$out"/lib/*.a ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/NSS"; description = "A set of libraries for development of security-enabled client and server applications"; license = licenses.mpl20; diff --git a/pkgs/development/libraries/nss/3.53.nix b/pkgs/development/libraries/nss/3.53.nix index dcd9ade629b..9f281743f6c 100644 --- a/pkgs/development/libraries/nss/3.53.nix +++ b/pkgs/development/libraries/nss/3.53.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja +{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja , # allow FIPS mode. Note that this makes the output non-reproducible. # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 enableFIPS ? false @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ]; buildInputs = [ zlib sqlite ]; @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'" ''; @@ -90,9 +90,9 @@ in stdenv.mkDerivation rec { -Dhost_arch=${host} \ -Duse_system_zlib=1 \ --enable-libpkix \ - ${stdenv.lib.optionalString enableFIPS "--enable-fips"} \ - ${stdenv.lib.optionalString stdenv.isDarwin "--clang"} \ - ${stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} + ${lib.optionalString enableFIPS "--enable-fips"} \ + ${lib.optionalString stdenv.isDarwin "--clang"} \ + ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} runHook postBuild ''; @@ -137,7 +137,7 @@ in stdenv.mkDerivation rec { isCross = stdenv.hostPlatform != stdenv.buildPlatform; nss = if isCross then buildPackages.nss.tools else "$out"; in - (stdenv.lib.optionalString enableFIPS ('' + (lib.optionalString enableFIPS ('' for libname in freebl3 nssdbm3 softokn3 do '' + (if stdenv.isDarwin @@ -160,7 +160,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/NSS"; description = "A set of libraries for development of security-enabled client and server applications"; license = licenses.mpl20; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 17dc93c9f1e..8c98d7ae9bb 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja +{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja , # allow FIPS mode. Note that this makes the output non-reproducible. # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 enableFIPS ? false @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ]; buildInputs = [ zlib sqlite ]; @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'" ''; @@ -96,9 +96,9 @@ in stdenv.mkDerivation rec { -Dhost_arch=${host} \ -Duse_system_zlib=1 \ --enable-libpkix \ - ${stdenv.lib.optionalString enableFIPS "--enable-fips"} \ - ${stdenv.lib.optionalString stdenv.isDarwin "--clang"} \ - ${stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} + ${lib.optionalString enableFIPS "--enable-fips"} \ + ${lib.optionalString stdenv.isDarwin "--clang"} \ + ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} runHook postBuild ''; @@ -143,7 +143,7 @@ in stdenv.mkDerivation rec { isCross = stdenv.hostPlatform != stdenv.buildPlatform; nss = if isCross then buildPackages.nss.tools else "$out"; in - (stdenv.lib.optionalString enableFIPS ('' + (lib.optionalString enableFIPS ('' for libname in freebl3 nssdbm3 softokn3 do '' + (if stdenv.isDarwin @@ -166,7 +166,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/NSS"; description = "A set of libraries for development of security-enabled client and server applications"; license = licenses.mpl20; diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 2b9321c7a90..3cdeb93dc9b 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkg-config }: +{ lib, stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { name = "nss_wrapper-1.1.11"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary;"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix index 5ea43097b8c..98ea6fa943f 100644 --- a/pkgs/development/libraries/ntbtls/default.nix +++ b/pkgs/development/libraries/ntbtls/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, gettext, libgpgerror, libgcrypt, libksba, zlib }: +{ lib, stdenv, fetchurl, gettext, libgpgerror, libgcrypt, libksba, zlib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "ntbtls"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; buildInputs = [ libgcrypt libgpgerror libksba zlib ] - ++ stdenv.lib.optional stdenv.isDarwin gettext; + ++ lib.optional stdenv.isDarwin gettext; postInstall = '' moveToOutput "bin/ntbtls-config" $dev diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index d0a9a2e5b49..021436516c2 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python2 , python3 @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace,ccan" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The not-so trivial database"; homepage = "https://tdb.samba.org/"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/development/libraries/ntirpc/default.nix index 48ef98dab49..e98cfac7858 100644 --- a/pkgs/development/libraries/ntirpc/default.nix +++ b/pkgs/development/libraries/ntirpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , krb5, liburcu , libtirpc, libnsl } : @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp ${libtirpc}/etc/netconfig $out/etc/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Transport-independent RPC (TI-RPC)"; homepage = "https://github.com/nfs-ganesha/ntirpc"; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 47fd43d7e35..cb9f9ff575f 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, pkg-config, libnl, python }: +{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python }: let version = "016"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Network Connectivity Tracking library for Desktop Applications"; homepage = "https://launchpad.net/ntrack"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/nuraft/default.nix b/pkgs/development/libraries/nuraft/default.nix index 1554e167815..58e5e401359 100644 --- a/pkgs/development/libraries/nuraft/default.nix +++ b/pkgs/development/libraries/nuraft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost172, asio, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, boost172, asio, openssl, zlib }: stdenv.mkDerivation rec { pname = "nuraft"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost172 asio openssl zlib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/eBay/NuRaft"; description = "C++ implementation of Raft core logic as a replication library"; license = licenses.asl20; diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index cafcf96e46b..c16305018d7 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2, pandoc }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2, pandoc }: stdenv.mkDerivation rec { pname = "nuspell"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { rm -rf $out/share/doc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free and open source C++ spell checking library"; homepage = "https://nuspell.github.io/"; platforms = platforms.all; diff --git a/pkgs/development/libraries/nv-codec-headers/default.nix b/pkgs/development/libraries/nv-codec-headers/default.nix index 8d3c2179bff..9b8323e6c97 100644 --- a/pkgs/development/libraries/nv-codec-headers/default.nix +++ b/pkgs/development/libraries/nv-codec-headers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "nv-codec-headers"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { description = "FFmpeg version of headers for NVENC"; homepage = "https://ffmpeg.org/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.MP2E ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.MP2E ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix b/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix index 667f3d94e05..f9c2547d424 100644 --- a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix +++ b/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "nvidia-optical-flow-sdk"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp -R * $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Nvidia optical flow headers for computing the relative motion of pixels between images"; homepage = "https://developer.nvidia.com/opticalflow-sdk"; license = licenses.bsd3; # applies to the header files only diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index 577f56e8c27..67624596720 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }: stdenv.mkDerivation rec { pname = "nvidia-texture-tools"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { moveToOutput lib "$lib" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of cuda-enabled texture tools and compressors"; homepage = "https://github.com/castano/nvidia-texture-tools"; license = licenses.mit; diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/development/libraries/nvidia-video-sdk/default.nix index d08f7185588..3a63bad03dc 100644 --- a/pkgs/development/libraries/nvidia-video-sdk/default.nix +++ b/pkgs/development/libraries/nvidia-video-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "nvidia-video-sdk-6.0.1"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp -R Samples/common/inc/* $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The NVIDIA Video Codec SDK"; homepage = "https://developer.nvidia.com/nvidia-video-codec-sdk"; license = licenses.unfree; diff --git a/pkgs/development/libraries/oatpp/default.nix b/pkgs/development/libraries/oatpp/default.nix index 38c02170761..084f3c4a935 100644 --- a/pkgs/development/libraries/oatpp/default.nix +++ b/pkgs/development/libraries/oatpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # Tests fail on darwin. See https://github.com/NixOS/nixpkgs/pull/105419#issuecomment-735826894 doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://oatpp.io/"; description = "Light and powerful C++ web framework for highly scalable and resource-efficient web applications"; license = licenses.asl20; diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index 30a8790b99a..b84aa6a146d 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }: +{lib, stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "ocl-icd"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i 's,"/etc/OpenCL/vendors","${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenCL ICD Loader for ${opencl-headers.name}"; homepage = "https://forge.imag.fr/projects/ocl-icd/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index d6047d1b192..d9c82f79bb3 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ode"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Dynamics Engine"; homepage = "https://sourceforge.net/projects/opende"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 22d48c8c609..b79de9278d4 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: +{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: let version = "4.1.0"; - libPath = stdenv.lib.makeLibraryPath [ oracle-instantclient.lib ]; + libPath = lib.makeLibraryPath [ oracle-instantclient.lib ]; in stdenv.mkDerivation { inherit version; @@ -16,24 +16,24 @@ in stdenv.mkDerivation { sha256 = "1zk08z74q7njbj329xfy8aszphj27rqlkhsyglai60wfzl6mcf4x"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ oracle-instantclient ] - ++ stdenv.lib.optionals stdenv.isLinux [ libaio ]; + ++ lib.optionals stdenv.isLinux [ libaio ]; dontPatchELF = true; makeFlags = [ "PREFIX=$(out)" "CC=cc" "LD=cc"]; postFixup = '' - ${stdenv.lib.optionalString (stdenv.isLinux) '' + ${lib.optionalString (stdenv.isLinux) '' patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary})" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary} ''} - ${stdenv.lib.optionalString (stdenv.isDarwin) '' + ${lib.optionalString (stdenv.isDarwin) '' install_name_tool -add_rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary} ''} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Oracle ODPI-C library"; homepage = "https://oracle.github.io/odpi/"; maintainers = with maintainers; [ mkazulak flokli ]; diff --git a/pkgs/development/libraries/ogdf/default.nix b/pkgs/development/libraries/ogdf/default.nix index bbef1d8b93d..bee64afd290 100644 --- a/pkgs/development/libraries/ogdf/default.nix +++ b/pkgs/development/libraries/ogdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, doxygen }: +{ lib, stdenv, fetchFromGitHub, cmake, doxygen }: stdenv.mkDerivation rec { pname = "ogdf"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { #> 766 | sprintf(messageOut_,format_+2); hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Graph Drawing Framework/Open Graph algorithms and Data structure Framework"; homepage = "http://www.ogdf.net"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/development/libraries/ogre/1.10.x.nix index 6bf239d061e..849db216b92 100644 --- a/pkgs/development/libraries/ogre/1.10.x.nix +++ b/pkgs/development/libraries/ogre/1.10.x.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation { meta = { description = "A 3D engine"; homepage = "https://www.ogre3d.org/"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index 8e0156d8452..30d1dd18554 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "A 3D engine"; homepage = "https://www.ogre3d.org/"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 8eb6db729ed..ae65da3f418 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { meta = { description = "A 3D engine"; homepage = "https://www.ogre3d.org/"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index 7e87ac43408..0aefedb5257 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }: +{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }: stdenv.mkDerivation rec { pname = "ogre-paged"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Paged Geometry for Ogre3D"; homepage = "https://github.com/RigsOfRods/ogre-paged"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index ee85e64966f..2edbc35aa89 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ] ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Object-oriented C++ input system"; maintainers = [ maintainers.raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 9efe524b12d..4fbc34bcce6 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "olm"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { description = "Implements double cryptographic ratchet and Megolm ratchet"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; homepage = "https://gitlab.matrix.org/matrix-org/olm"; - platforms = with stdenv.lib.platforms; darwin ++ linux; + platforms = with lib.platforms; darwin ++ linux; }; } diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 44420c85cf5..016207c1306 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "onig"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kkos/oniguruma"; description = "Regular expressions library"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix index e9d501f7928..cba7e7b285d 100644 --- a/pkgs/development/libraries/opae/default.nix +++ b/pkgs/development/libraries/opae/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , libuuid, json_c , doxygen, perl, python2, python2Packages }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_ASE=1" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Programmable Acceleration Engine SDK"; homepage = "https://01.org/opae"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index efc5a18f2b0..43c781cf52c 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , alsaSupport ? !stdenv.isDarwin, alsaLib ? null , pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null , CoreServices, AudioUnit, AudioToolbox }: -with stdenv.lib; +with lib; assert alsaSupport -> alsaLib != null; assert pulseSupport -> libpulseaudio != null; diff --git a/pkgs/development/libraries/openbabel/2.nix b/pkgs/development/libraries/openbabel/2.nix index 41631da1241..11265c643f9 100644 --- a/pkgs/development/libraries/openbabel/2.nix +++ b/pkgs/development/libraries/openbabel/2.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.4.1"; src = fetchurl { - url = "https://github.com/openbabel/openbabel/archive/openbabel-${stdenv.lib.replaceStrings ["."] ["-"] version}.tar.gz"; + url = "https://github.com/openbabel/openbabel/archive/openbabel-${lib.replaceStrings ["."] ["-"] version}.tar.gz"; sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r"; }; diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index 301025dfd20..63784d94d8f 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.1.1"; src = fetchurl { - url = "https://github.com/openbabel/openbabel/archive/openbabel-${stdenv.lib.replaceStrings ["."] ["-"] version}.tar.gz"; + url = "https://github.com/openbabel/openbabel/archive/openbabel-${lib.replaceStrings ["."] ["-"] version}.tar.gz"; sha256 = "c97023ac6300d26176c97d4ef39957f06e68848d64f1a04b0b284ccff2744f02"; }; diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 3e2d0f6b6e8..8e56e250ac4 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }: +{ lib, stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }: stdenv.mkDerivation { @@ -19,9 +19,9 @@ stdenv.mkDerivation { meta = { description = "Open Source Biometric Recognition"; homepage = "http://openbiometrics.org/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [flosse]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [flosse]; + platforms = with lib.platforms; linux; broken = true; }; } diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/development/libraries/opencascade-occt/default.nix index ac2b8ba6d1e..59c1f0ef7db 100644 --- a/pkgs/development/libraries/opencascade-occt/default.nix +++ b/pkgs/development/libraries/opencascade-occt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk, +{ lib, stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk, libGL, libGLU, libXext, libXmu, libXi, darwin }: stdenv.mkDerivation rec { @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; buildInputs = [ tcl tk libGL libGLU libXext libXmu libXi ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - meta = with stdenv.lib; { + meta = with lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; homepage = "https://www.opencascade.org/"; license = licenses.lgpl21; # essentially... diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index ad17e7dcac7..5c262a3680c 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, +{ lib, stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, pkg-config, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb, OpenCL, Cocoa }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "opencascade-oce"; version = "0.18.3"; diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index 8b7df317b2b..8bbde9796d9 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -15,10 +16,10 @@ let inherit spirv-llvm-translator; }; - inherit (stdenv.lib) getVersion; + inherit (lib) getVersion; addPatches = component: pkg: - with builtins; with stdenv.lib; + with builtins; with lib; let path = "${passthru.patchesOut}/${component}"; in pkg.overrideAttrs (super: { postPatch = (if super ? postPatch then super.postPatch + "\n" else "") + '' @@ -39,7 +40,7 @@ let patchesOut = stdenv.mkDerivation rec { pname = "opencl-clang-patches"; - inherit (lib) version src patches; + inherit (library) version src patches; installPhase = '' [ -d patches ] && cp -r patches/ $out || mkdir $out mkdir -p $out/clang $out/spirv @@ -50,7 +51,7 @@ let }; - lib = let + library = let inherit (llvmPkgs) llvm; inherit (if buildWithPatches then passthru else llvmPkgs) clang-unwrapped spirv-llvm-translator; in @@ -85,7 +86,7 @@ let "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/intel/opencl-clang/"; description = "A clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules"; license = licenses.ncsa; @@ -94,4 +95,4 @@ let }; }; in - lib + library diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix index 1486ea93175..ec40bc393d5 100644 --- a/pkgs/development/libraries/opencl-clhpp/default.nix +++ b/pkgs/development/libraries/opencl-clhpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python, opencl-headers }: +{ lib, stdenv, fetchFromGitHub, cmake, python, opencl-headers }: stdenv.mkDerivation rec { pname = "opencl-clhpp"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DBUILD_TESTS=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenCL Host API C++ bindings"; homepage = "http://github.khronos.org/OpenCL-CLHPP/"; license = licenses.mit; diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index aaf6390d00a..1ef27bf5831 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp CL/* $out/include/CL ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Khronos OpenCL headers version ${version}"; homepage = "https://www.khronos.org/registry/cl/"; license = licenses.mit; diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index a9c26d00e3a..d0582217433 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "A library for handling the COLLADA file format"; homepage = "https://github.com/KhronosGroup/OpenCOLLADA/"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.unix; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 6745d6bf0ce..8908f486615 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { mkdir -p $bin/bin; mv $out/bin $bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://opencolorio.org"; description = "A color management framework for visual effects and animation"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix index f011def0eb9..d1348d96e3b 100644 --- a/pkgs/development/libraries/opencore-amr/default.nix +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "0.1.5"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { homepage = "https://opencore-amr.sourceforge.io/"; description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.kiloreux ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.kiloreux ]; }; } diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 00d489508ad..53adbdf414f 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libGLU, libGL, freeglut, glew, libXmu, libXext, libX11 +{lib, stdenv, fetchurl, libGLU, libGL, freeglut, glew, libXmu, libXext, libX11 , qmake, GLUT, fixDarwinDylibNames }: stdenv.mkDerivation rec { @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qmake ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ glew ] - ++ stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut libXmu libXext libX11 ] - ++ stdenv.lib.optional stdenv.isDarwin GLUT; + ++ lib.optionals stdenv.isLinux [ libGLU libGL freeglut libXmu libXext libX11 ] + ++ lib.optional stdenv.isDarwin GLUT; doCheck = false; @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { postInstall = '' install -D license.txt "$out/share/doc/opencsg/license.txt" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv $out/bin/*.app $out/Applications rmdir $out/bin || true ''; - postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.isDarwin '' app=$out/Applications/opencsgexample.app/Contents/MacOS/opencsgexample install_name_tool -change \ $(otool -L $app | awk '/opencsg.+dylib/ { print $1 }') \ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { $app ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Constructive Solid Geometry library"; homepage = "http://www.opencsg.org/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index c0a021a9d3b..92dec5ee233 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcsclite, libusb-compat-0_1 +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcsclite, libusb-compat-0_1 , doxygen, libxslt }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { mkdir -p $out/etc ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/OpenSC/openct/"; license = licenses.lgpl21; description = "Drivers for several smart card readers"; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 8a846808080..11872cd47cc 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -269,7 +269,7 @@ stdenv.mkDerivation { passthru = lib.optionalAttrs enablePython { pythonPath = []; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; license = with licenses; if enableUnfree then unfree else bsd3; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 3d845b7368b..c9ac76b6554 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -278,7 +278,7 @@ stdenv.mkDerivation { passthru = lib.optionalAttrs enablePython { pythonPath = []; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; license = with licenses; if enableUnfree then unfree else bsd3; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 0d4d2c6e001..2575f6bb45d 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { passthru = lib.optionalAttrs enablePython { pythonPath = []; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 954e6cc6b66..a9eb209edda 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }: +{ lib, stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }: -let inherit (stdenv.lib) getDev; in +let inherit (lib) getDev; in stdenv.mkDerivation rec { name = "opendbx-1.4.6"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline libmysqlclient postgresql sqlite ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extremely lightweight but extensible database access library written in C"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index e160bfb7d36..7f4f186c923 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , cmake, pkg-config , asio, nettle, gnutls, msgpack, readline, libargon2 }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++11 Kademlia distributed hash table implementation"; homepage = "https://github.com/savoirfairelinux/opendht"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index b40b3bc4def..90c7fb85d42 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libbsd, openssl, libmilter +{ lib, stdenv, fetchurl, pkg-config, libbsd, openssl, libmilter , autoreconfHook, perl, makeWrapper }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${openssl.bin}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service"; homepage = "http://www.opendkim.org/"; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/opendmarc/default.nix b/pkgs/development/libraries/opendmarc/default.nix index 9b45cc244f2..0dedfa3a85e 100644 --- a/pkgs/development/libraries/opendmarc/default.nix +++ b/pkgs/development/libraries/opendmarc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libmilter, perl, perlPackages, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libmilter, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { pname = "opendmarc"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free open source software implementation of the DMARC specification"; homepage = "http://www.trusteddomain.org/opendmarc/"; license = with licenses; [ bsd3 sendmail ]; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index b33b284f45c..4e04de30d65 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ ilmbase zlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A high dynamic-range (HDR) image file format"; homepage = "https://www.openexr.com/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index 92cd343cf6a..ce35aa1c655 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }: +{ lib, stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }: stdenv.mkDerivation { pname = "openexrid-unstable"; @@ -44,7 +44,7 @@ stdenv.mkDerivation { mv $out/lib $lib/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenEXR files able to isolate any object of a CG image with a perfect antialiazing"; homepage = "https://github.com/MercenariesEngineering/openexrid"; maintainers = [ maintainers.guibou ]; diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index f652c5ee7b7..51e661eabb3 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "openfst"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for working with finite-state transducers"; longDescription = '' Library for constructing, combining, optimizing, and searching weighted finite-state transducers (FSTs). diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix index 4a7927bfcb2..0d8afe53df8 100644 --- a/pkgs/development/libraries/openfx/default.nix +++ b/pkgs/development/libraries/openfx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip }: +{ lib, stdenv, fetchFromGitHub, unzip }: stdenv.mkDerivation { pname = "openfx"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { cp -r include/* $dev/include/OpenFX/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Image processing plug-in standard"; homepage = "http://openeffects.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/opengrm-ngram/default.nix b/pkgs/development/libraries/opengrm-ngram/default.nix index ab546c6d0d4..9b105808b8b 100644 --- a/pkgs/development/libraries/opengrm-ngram/default.nix +++ b/pkgs/development/libraries/opengrm-ngram/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchurl, openfst }: +{ lib, stdenv, autoreconfHook, fetchurl, openfst }: stdenv.mkDerivation rec { pname = "opengrm-ngram"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to make and modify n-gram language models encoded as weighted finite-state transducers"; homepage = "http://www.openfst.org/twiki/bin/view/GRM/NGramLibrary"; license = licenses.asl20; diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index ee430f800dd..6e856b04ac4 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nasm }: +{ lib, stdenv, fetchFromGitHub, nasm }: stdenv.mkDerivation rec { pname = "openh264"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A codec library which supports H.264 encoding and decoding"; homepage = "https://www.openh264.org"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/openhmd/default.nix b/pkgs/development/libraries/openhmd/default.nix index ab1b9b7b1dd..a692dcb5e4e 100644 --- a/pkgs/development/libraries/openhmd/default.nix +++ b/pkgs/development/libraries/openhmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ hidapi - ] ++ stdenv.lib.optionals withExamples [ + ] ++ lib.optionals withExamples [ SDL2 glew libGL @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { "-DOpenGL_GL_PREFERENCE=GLVND" ]; - postInstall = stdenv.lib.optionalString withExamples '' + postInstall = lib.optionalString withExamples '' mkdir -p $out/bin install -D examples/simple/simple $out/bin/openhmd-example-simple install -D examples/opengl/openglexample $out/bin/openhmd-example-opengl ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.openhmd.net"; # https does not work description = "Library API and drivers immersive technology"; longDescription = '' diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix index 2ac74c6c240..03f9118ef7c 100644 --- a/pkgs/development/libraries/openimagedenoise/default.nix +++ b/pkgs/development/libraries/openimagedenoise/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, cmake, tbb, python, ispc }: +{ lib, stdenv, fetchzip, cmake, tbb, python, ispc }: stdenv.mkDerivation rec { pname = "openimagedenoise"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python ispc ]; buildInputs = [ tbb ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://openimagedenoise.github.io"; description = "High-Performance Denoising Library for Ray Tracing"; license = licenses.asl20; diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index 5ed35844eb0..8c1f18b987d 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , libpng, libtiff, lcms2, jpylyzer , mj2Support ? true # MJ2 executables , jpwlLibSupport ? true # JPWL library & executables @@ -19,7 +19,7 @@ assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null; assert (openjpegJarSupport || jpipLibSupport) -> jdk != null; let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}"; in @@ -74,7 +74,7 @@ stdenv.mkDerivation { incDir = "openjpeg-${branch}"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open-source JPEG 2000 codec written in C language"; homepage = "https://www.openjpeg.org/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index fdf3298a6fa..4d4ec1763f0 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }: +{ lib, stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }: stdenv.mkDerivation rec { pname = "openldap"; @@ -34,12 +34,12 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--enable-crypt" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--with-yielding_select=yes" "ac_cv_func_memcmp_working=yes" - ] ++ stdenv.lib.optional (openssl == null) "--without-tls" - ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" - ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + ] ++ lib.optional (openssl == null) "--without-tls" + ++ lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" + ++ lib.optional stdenv.isFreeBSD "--with-pic"; postBuild = '' make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/sha2 @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { chmod +x "$out"/lib/*.{so,dylib} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.openldap.org/"; description = "An open source implementation of the Lightweight Directory Access Protocol"; license = licenses.openldap; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 95c2a9c3fcf..802685970ac 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl +{ lib, stdenv, fetchurl, fetchpatch, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin , libpsm2, libfabric, pmix, ucx @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { pname = "openmpi"; inherit version; - src = with stdenv.lib.versions; fetchurl { + src = with lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; sha256 = "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5"; }; @@ -97,7 +97,7 @@ in stdenv.mkDerivation rec { inherit cudaSupport cudatoolkit; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.open-mpi.org/"; description = "Open source MPI-3 implementation"; longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers."; diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix index 46729f660b1..3a6416122bf 100644 --- a/pkgs/development/libraries/openpa/default.nix +++ b/pkgs/development/libraries/openpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file }: +{ lib, stdenv, fetchurl, file }: stdenv.mkDerivation rec { pname = "openpa"; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { meta = { description = "Atomic primitives for high performance, concurrent software"; homepage = "https://trac.mpich.org/projects/openpa"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ leenaars ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ leenaars ]; + platforms = with lib.platforms; linux; longDescription = '' OPA (or sometimes OpenPA or Open Portable Atomics) is an open source library intended to provide a consistent C API for performing diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index 779e17e4c81..4f83f22856e 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkg-config +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config , boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://shibboleth.net/products/opensaml-cpp.html"; description = "A low-level library written in C++ that provides support for producing and consuming SAML messages"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 78c37e94b93..8eeff3de943 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON"; - meta = with stdenv.lib; { + meta = with lib; { description = "A 3D graphics toolkit"; homepage = "http://www.openscenegraph.org/"; maintainers = with maintainers; [ aanderse raskin ]; diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix index 68cb40abf72..ddc0e893596 100644 --- a/pkgs/development/libraries/openslp/default.nix +++ b/pkgs/development/libraries/openslp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation { name = "openslp-2.0.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { ./CVE-2016-4912.patch ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.openslp.org/"; description = "An open-source implementation of the IETF Service Location Protocol"; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index b37142082d8..bae3e53f441 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, perl, zlib +{ lib, stdenv, fetchFromGitHub, perl, zlib , withCryptodev ? false, cryptodev }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "openssl-chacha"; version = "2016-08-22"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { setOutputFlags = false; nativeBuildInputs = [ perl zlib ]; - buildInputs = stdenv.lib.optional withCryptodev cryptodev; + buildInputs = lib.optional withCryptodev cryptodev; configureScript = "./config"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { "enable-gost" "--libdir=lib" "--openssldir=etc/ssl" - ] ++ stdenv.lib.optionals withCryptodev [ + ] ++ lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" ]; @@ -75,7 +75,7 @@ stdenv.mkDerivation { homepage = "https://www.openssl.org/"; description = "A cryptographic library that implements the SSL and TLS protocols"; platforms = [ "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.cstrahan ]; + maintainers = [ lib.maintainers.cstrahan ]; license = licenses.openssl; priority = 10; # resolves collision with ‘man-pages’ }; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2570c7cdb25..ce4374be331 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPackages, perl, coreutils +{ lib, stdenv, fetchurl, buildPackages, perl, coreutils , withCryptodev ? false, cryptodev , enableSSL2 ? false , enableSSL3 ? false @@ -10,7 +10,7 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -with stdenv.lib; +with lib; let common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }: @@ -46,7 +46,7 @@ let separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optional withCryptodev cryptodev; + buildInputs = lib.optional withCryptodev cryptodev; # TODO(@Ericson2314): Improve with mass rebuild configurePlatforms = []; @@ -78,16 +78,16 @@ let "shared" # "shared" builds both shared and static libraries "--libdir=lib" "--openssldir=etc/ssl" - ] ++ stdenv.lib.optionals withCryptodev [ + ] ++ lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" - ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" - ++ stdenv.lib.optional enableSSL3 "enable-ssl3" - ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng" + ] ++ lib.optional enableSSL2 "enable-ssl2" + ++ lib.optional enableSSL3 "enable-ssl3" + ++ lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng" # OpenSSL needs a specific `no-shared` configure flag. # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options # for a comprehensive list of configuration options. - ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && static) "no-shared"; + ++ lib.optional (versionAtLeast version "1.1.0" && static) "no-shared"; makeFlags = [ "MANDIR=$(man)/share/man" @@ -101,7 +101,7 @@ let enableParallelBuilding = true; postInstall = - stdenv.lib.optionalString (!static) '' + lib.optionalString (!static) '' # If we're building dynamic libraries, then don't install static # libraries. if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then @@ -111,7 +111,7 @@ let '' + '' mkdir -p $bin - '' + stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows) + '' + lib.optionalString (!stdenv.hostPlatform.isWindows) '' substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl} ${perl} '' + @@ -127,7 +127,7 @@ let rmdir $out/etc/ssl/{certs,private} ''; - postFixup = stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) '' # Check to make sure the main output doesn't depend on perl if grep -r '${buildPackages.perl}' $out; then echo "Found an erroneous dependency on perl ^^^" >&2 @@ -135,7 +135,7 @@ let fi ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.openssl.org/"; description = "A cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix index 76342abaa2d..9c99ee6027d 100644 --- a/pkgs/development/libraries/opentracing-cpp/default.nix +++ b/pkgs/development/libraries/opentracing-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "opentracing-cpp"; version = "1.5.1"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { description = "C++ implementation of the OpenTracing API"; homepage = "https://opentracing.io"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ rob ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ rob ]; }; } diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index 38e50fb367e..5f3a03a3f5b 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: +{ lib, stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec NIX_CFLAGS_COMPILE="-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR/"; NIX_LDFLAGS="-lboost_iostreams"; - meta = with stdenv.lib; { + meta = with lib; { description = "An open framework for voxel"; homepage = "https://www.openvdb.org"; maintainers = [ maintainers.guibou ]; diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index e139a1f509c..05f1ef65a30 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , curl, libxml2, pam, sblim-sfcc }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-more-warnings" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Openwsman server implementation and client API with bindings"; downloadPage = "https://github.com/Openwsman/openwsman/releases"; homepage = "https://openwsman.github.io"; diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 415846dd2fa..2f901f0e412 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL }: stdenv.mkDerivation rec { pname = "openxr-loader"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { mv "$out/lib/libXrApiLayer"* "$layers/lib" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Khronos OpenXR loader"; homepage = "https://www.khronos.org/openxr"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index 641776cc944..0a617561a89 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , doxygen, fontconfig, graphviz-nox, libxml2, pkg-config, which , systemd }: @@ -51,7 +51,7 @@ in stdenv.mkDerivation { --replace pcfile=${pkg-config} pcfile=$out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller"; homepage = "http://www.openzwave.net/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index aba9c75ad46..c6efc901e8a 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoPatchelfHook , fixDarwinDylibNames @@ -12,7 +12,7 @@ assert odbcSupport -> unixODBC != null; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -114,7 +114,7 @@ in stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Oracle instant client libraries and sqlplus CLI"; longDescription = '' Oracle instant client provides access to Oracle databases (OCI, diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index 4a01de54a6d..5c9c2c8da7f 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, check, subunit }: +{ lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; version = "2.1.1"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Potluck with different functions for different purposes that can be shared among C programs"; homepage = "https://github.com/babelouest/orcania"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index ecd15498432..196cac4bcaf 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -1,7 +1,7 @@ { bctoolbox , cmake , fetchFromGitLab -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ bctoolbox ]; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Real-Time Transport Protocol (RFC3550) stack"; homepage = "https://linphone.org/technical-corner/ortp"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index 8b2dce1d950..322ed30a847 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { version = "5.2.0"; src = fetchurl { @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libosip2"; meta = { - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; homepage = "https://www.gnu.org/software/osip/"; description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.linux; inherit version; }; } diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index f1aa1968493..17a3af68a80 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,4 +1,4 @@ -{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkg-config, stdenv }: +{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkg-config, lib, stdenv }: stdenv.mkDerivation rec { pname = "osm-gps-map"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { gnome3.gnome-common gtk3 gnome3.libsoup ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK widget for displaying OpenStreetMap tiles"; homepage = "https://nzjrs.github.io/osm-gps-map"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index a93bc6763c0..0e09d563ea1 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, which +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, which , gettext, libffi, libiconv, libtasn1 }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "exampledir=${placeholder "out"}/etc/pkcs11" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for loading and sharing PKCS#11 modules"; longDescription = '' Provides a way to load and enumerate PKCS#11 modules. diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index 017cb25a9d1..7bf0cb2c5fb 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -22,7 +22,7 @@ let p2 = buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "The simple and easy way to embed static files into Go binaries"; homepage = "https://github.com/gobuffalo/packr"; license = licenses.mit; diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix index 4723292199d..abef3d6cd1d 100644 --- a/pkgs/development/libraries/pagmo2/default.nix +++ b/pkgs/development/libraries/pagmo2/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub -, stdenv +, lib, stdenv , cmake , eigen , nlopt @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # tests pass but take 30+ minutes doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://esa.github.io/pagmo2/"; description = "Scientific library for massively parallel optimization"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index ff1fcb945ca..68511003215 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, fetchpatch, pkg-config, cairo, harfbuzz +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, cairo, harfbuzz , libintl, libthai, gobject-introspection, darwin, fribidi, gnome3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf , meson, ninja, glib , x11Support? !stdenv.isDarwin, libXft }: -with stdenv.lib; +with lib; let pname = "pango"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0ry3j9n0lvdfmjwi2w7wa4gkalnip56kghqq6bh8hcf45xjvh3bk"; }; @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "-Dxft=disabled" # only works with x11 ]; @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for laying out and rendering of text, with an emphasis on internationalization"; longDescription = '' diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 4cb90e297cf..0e5d705a1ce 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation { graphical data. ''; homepage = "https://github.com/stevenlovegrove/Pangolin"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.expipiplus1 ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.expipiplus1 ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 1443e74d608..0ff0d9a7d4e 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, pango, glibmm, cairomm, gnome3 +{ lib, stdenv, fetchurl, pkg-config, pango, glibmm, cairomm, gnome3 , ApplicationServices }: stdenv.mkDerivation rec { @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { version= "2.42.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "03zli5amizhv9bfklwfq7xyf0b5dagchx1lnz9f0v1rhk69h9gql"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config ] ++ stdenv.lib.optional stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ pango glibmm cairomm ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ interface to the Pango text rendering library"; homepage = "https://www.pango.org/"; license = with licenses; [ lgpl2 lgpl21 ]; diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index ff23a7f30f2..7d314a930f2 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkg-config, glib, pango}: +{lib, stdenv, fetchurl, pkg-config, glib, pango}: stdenv.mkDerivation { name = "pangoxsl-1.6.0.3"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { pango ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango"; homepage = "https://sourceforge.net/projects/pangopdf"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index 2f7574d3637..0247d12715f 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, python, doxygen, xorg }: +{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, python, doxygen, xorg }: stdenv.mkDerivation { pname = "partio"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { mv $dev/include/*.h $dev/include/partio ''; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC"; homepage = "https://www.disneyanimation.com/technology/partio.html"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/pc-ble-driver/default.nix b/pkgs/development/libraries/pc-ble-driver/default.nix index 7d7dbd53383..1777b0856f8 100644 --- a/pkgs/development/libraries/pc-ble-driver/default.nix +++ b/pkgs/development/libraries/pc-ble-driver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, cmake, catch2, asio, udev, IOKit }: +{ lib, stdenv, fetchFromGitHub, git, cmake, catch2, asio, udev, IOKit }: stdenv.mkDerivation rec { pname = "pc-ble-driver"; @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ IOKit - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ udev ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop library for Bluetooth low energy development"; homepage = "https://github.com/NordicSemiconductor/pc-ble-driver"; license = licenses.unfreeRedistributable; diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index 8301d1a6f1a..ebdacdfc9bd 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides a C API to different audio devices"; homepage = "https://github.com/espeak-ng/pcaudiolib"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index 593794c9c4d..9722210b9d1 100644 --- a/pkgs/development/libraries/pcg-c/default.nix +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "0.94"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A family of better random number generators"; homepage = "https://www.pcg-random.org/"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; longDescription = '' PCG is a family of simple fast space-efficient statistically good algorithms for random number generation. Unlike many general-purpose RNGs, diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 0c57e8b4b68..436e0f85e16 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , qhull, flann, boost, vtk, eigen, pkg-config, qtbase , libusb1, libpcap, libXt, libpng, Cocoa, AGL, OpenGL }: @@ -16,18 +16,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ qhull flann boost eigen libusb1 libpcap libpng vtk qtbase libXt ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL ]; + ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ]; - cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]; meta = { homepage = "https://pointclouds.org/"; - broken = stdenv.lib.versionAtLeast qtbase.version "5.15"; + broken = lib.versionAtLeast qtbase.version "5.15"; description = "Open project for 2D/3D image and point cloud processing"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 8f19034c924..8d9b9ec0259 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pcre, windows ? null , variant ? null }: -with stdenv.lib; +with lib; assert elem variant [ null "cpp" "pcre16" "pcre32" ]; @@ -50,7 +50,7 @@ in stdenv.mkDerivation { meta = { homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; longDescription = '' The PCRE library is a set of functions that implement regular diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 8f06630882c..6bf6cff98bb 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "pcre2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-pcre2-16" "--enable-pcre2-32" - ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isRiscV) "--enable-jit"; + ] ++ lib.optional (!stdenv.hostPlatform.isRiscV) "--enable-jit"; outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { moveToOutput bin/pcre2-config "$dev" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Perl Compatible Regular Expressions"; homepage = "http://www.pcre.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index 4405d3812b7..42e05d5d7ff 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { "-DBUILD_PLUGIN_RIVLIB=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data"; homepage = "https://pdal.io"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix index 855df954eb1..2dfd3546685 100644 --- a/pkgs/development/libraries/pdf2xml/default.nix +++ b/pkgs/development/libraries/pdf2xml/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libxpdf, libxml2}: +{lib, stdenv, fetchurl, libxpdf, libxml2}: stdenv.mkDerivation { name = "pdf2xml"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { cp exe/* $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PDF to XML converter"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix index dbc7e0c3a59..250089c30b1 100644 --- a/pkgs/development/libraries/phash/default.nix +++ b/pkgs/development/libraries/phash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, cimg, imagemagick }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cimg, imagemagick }: stdenv.mkDerivation rec { pname = "pHash"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0y4gknfkns5sssfaj0snyx29752my20xmxajg6xggijx0myabbv0"; }; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Compute the perceptual hash of an image"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/phonetisaurus/default.nix b/pkgs/development/libraries/phonetisaurus/default.nix index 126a91fe290..abacfdc1cce 100644 --- a/pkgs/development/libraries/phonetisaurus/default.nix +++ b/pkgs/development/libraries/phonetisaurus/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , openfst , pkg-config @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ python3 openfst ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Framework for Grapheme-to-phoneme models for speech recognition using the OpenFst framework"; inherit (src.meta) homepage; license = licenses.bsd3; diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index c066e15a8f9..249ce4e3629 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "phonon-backend-gstreamer"; version = "4.10.0"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://phonon.kde.org/"; description = "GStreamer backend for Phonon"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 3dc5071ba15..07e6ccf1f34 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "phonon-backend-vlc"; version = "0.11.1"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://phonon.kde.org/"; description = "GStreamer backend for Phonon"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 926b8593c59..88a6af658dd 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://community.kde.org/Phonon"; description = "Multimedia API for Qt"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + license = lib.licenses.lgpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ttuegel ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 93c0702e3ef..3eb4077d985 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, doxygen, darwin +{ lib, stdenv, fetchurl, cmake, doxygen, darwin , zlib }: let @@ -15,7 +15,7 @@ let nativeBuildInputs = [ cmake doxygen ]; buildInputs = [ zlib ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; patchPhase = '' sed s,-Werror,, -i CMakeLists.txt @@ -27,7 +27,7 @@ let ./test_physfs --version ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://icculus.org/physfs/"; description = "Library to provide abstract access to various archives"; license = licenses.free; diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix index 7b201cf9b16..e3fd0a26a7f 100644 --- a/pkgs/development/libraries/physics/apfel/default.nix +++ b/pkgs/development/libraries/physics/apfel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gfortran, lhapdf, python2, zlib }: +{ lib, stdenv, fetchFromGitHub, gfortran, lhapdf, python2, zlib }: stdenv.mkDerivation rec { pname = "apfel"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A PDF Evolution Library"; license = licenses.gpl3; homepage = "https://apfel.mi.infn.it/"; diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix index 5c63ce7c4b9..33ca0326727 100644 --- a/pkgs/development/libraries/physics/apfelgrid/default.nix +++ b/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }: stdenv.mkDerivation rec { pname = "apfelgrid"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Ultra-fast theory predictions for collider observables"; license = licenses.mit; homepage = "http://nhartland.github.io/APFELgrid/"; diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index 6b1bc71c660..65aa7b8b470 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }: +{ lib, stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }: stdenv.mkDerivation rec { pname = "applgrid"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The APPLgrid project provides a fast and flexible way to reproduce the results of full NLO calculations with any input parton distribution set in only a few milliseconds rather than the weeks normally required to gain adequate statistics"; license = licenses.gpl3; homepage = "http://applgrid.hepforge.org"; diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index 3c2cd4c6914..84657d72679 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, gnumake, imake, makedepend, motif, xorg }: +{ lib, stdenv, fetchurl, gfortran, gnumake, imake, makedepend, motif, xorg }: stdenv.mkDerivation rec { version = "2006"; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { description = "Legacy collection of libraries and modules for data analysis in high energy physics"; broken = stdenv.isDarwin; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; - license = stdenv.lib.licenses.gpl2; + maintainers = with lib.maintainers; [ veprbl ]; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix index 68e07e7b42d..a09f031e765 100644 --- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fastjet }: +{ lib, stdenv, fetchurl, fastjet }: stdenv.mkDerivation rec { pname = "fastjet-contrib"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { make fragile-shared-install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Third party extensions for FastJet"; homepage = "http://fastjet.fr/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index b854fa88cd6..35ce8dedca7 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2 }: +{ lib, stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { pname = "fastjet"; @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { meta = { description = "A software package for jet finding in pp and e+e− collisions"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://fastjet.fr/"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index 22251e10a4f..916303f00ce 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }: +{ lib, stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }: stdenv.mkDerivation rec { pname = "fastnlo_toolkit"; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { meta = { description = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; homepage = "http://fastnlo.hepforge.org"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix index 42014949c0b..e51a5937ddb 100644 --- a/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/pkgs/development/libraries/physics/geant4/datasets.nix @@ -24,7 +24,7 @@ let inherit envvar; setupHook = ./datasets-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "Data files for the Geant4 toolkit"; homepage = "https://geant4.web.cern.ch/support/download"; license = licenses.g4sl; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 0b48b291555..27d67d9af0c 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -9,7 +9,7 @@ , enableRaytracerX11 ? false # Standard build environment with cmake. -, stdenv, fetchurl, fetchpatch, cmake +, lib, stdenv, fetchurl, fetchpatch, cmake # Optional system packages, otherwise internal GEANT4 packages are used. , clhep ? null # not packaged currently @@ -80,9 +80,9 @@ stdenv.mkDerivation rec { "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}" "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}" "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" - ] ++ stdenv.lib.optionals (enableMultiThreading && enablePython) [ + ] ++ lib.optionals (enableMultiThreading && enablePython) [ "-DGEANT4_BUILD_TLS_MODEL=global-dynamic" - ] ++ stdenv.lib.optionals enableInventor [ + ] ++ lib.optionals enableInventor [ "-DINVENTOR_INCLUDE_DIR=${coin3d}/include" "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" ]; @@ -90,13 +90,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU xlibsWrapper libXmu ] - ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt motif ] - ++ stdenv.lib.optionals enablePython [ boost_python python3 ]; + ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] + ++ lib.optionals enablePython [ boost_python python3 ]; propagatedBuildInputs = [ clhep expat zlib libGL ] - ++ stdenv.lib.optionals enableGDML [ xercesc ] - ++ stdenv.lib.optionals enableXM [ motif ] - ++ stdenv.lib.optionals enableQT [ qtbase ]; + ++ lib.optionals enableGDML [ xercesc ] + ++ lib.optionals enableXM [ motif ] + ++ lib.optionals enableQT [ qtbase ]; postFixup = '' # Don't try to export invalid environment variables. @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { source $out/nix-support/setup-hook ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A toolkit for the simulation of the passage of particles through matter"; longDescription = '' Geant4 is a toolkit for the simulation of the passage of particles through matter. diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix index b27d947ea5c..e2ab42c418a 100644 --- a/pkgs/development/libraries/physics/hepmc2/default.nix +++ b/pkgs/development/libraries/physics/hepmc2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "hepmc"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "-Dlength:STRING=MM" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators"; license = licenses.lgpl21; homepage = "http://hepmc.web.cern.ch/hepmc/"; diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index 10b789f514f..0b1b1f8fa57 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, coreutils, python, root }: +{ lib, stdenv, fetchurl, cmake, coreutils, python, root }: let - pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}"; + pythonVersion = with lib.versions; "${major python.version}${minor python.version}"; withPython = python != null; # ensure that root is built with the same python interpreter, as it links against numpy root_py = if withPython then root.override { inherit python; } else root; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ root_py ] - ++ stdenv.lib.optional withPython python; + ++ lib.optional withPython python; cmakeFlags = [ "-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}" - ] ++ stdenv.lib.optionals withPython [ + ] ++ lib.optionals withPython [ "-DHEPMC3_PYTHON_VERSIONS=${if python.isPy3k then "3.X" else "2.X"}" "-DHEPMC3_Python_SITEARCH${pythonVersion}=${placeholder "out"}/${python.sitePackages}" ]; @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { doInstallCheck = withPython; # prevent nix from trying to dereference a null python - installCheckPhase = stdenv.lib.optionalString withPython '' + installCheckPhase = lib.optionalString withPython '' PYTHONPATH=${placeholder "out"}/${python.sitePackages} python -c 'import pyHepMC3' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation"; license = licenses.gpl3; homepage = "http://hepmc.web.cern.ch/hepmc/"; diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index c1a803fd314..d3f6bcb7474 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }: +{ lib, stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "herwig"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A multi-purpose particle physics event generator"; homepage = "https://herwig.hepforge.org/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix index 6ac3b950be3..7ad5b9861a1 100644 --- a/pkgs/development/libraries/physics/hoppet/default.nix +++ b/pkgs/development/libraries/physics/hoppet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, perl }: +{ lib, stdenv, fetchurl, gfortran, perl }: stdenv.mkDerivation rec { pname = "hoppet"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Higher Order Perturbative Parton Evolution Toolkit"; license = licenses.gpl2; homepage = "https://hoppet.hepforge.org"; diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 7d412f86596..19e9f9d9ec8 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2, makeWrapper }: +{ lib, stdenv, fetchurl, python2, makeWrapper }: stdenv.mkDerivation rec { pname = "lhapdf"; @@ -15,18 +15,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - pdf_sets = import ./pdf_sets.nix { inherit stdenv fetchurl; }; + pdf_sets = import ./pdf_sets.nix { inherit lib stdenv fetchurl; }; }; postInstall = '' wrapProgram $out/bin/lhapdf --prefix PYTHONPATH : "$(toPythonPath "$out")" ''; - meta = { + meta = with lib; { description = "A general purpose interpolator, used for evaluating Parton Distribution Functions from discretised data files"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; homepage = "http://lhapdf.hepforge.org"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix index 2309e6671f8..7fb3e640c7d 100644 --- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix +++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let mkPdfSet = name: sha256: @@ -20,7 +20,7 @@ let setupHook = ./pdfset-hook.sh; }; in - stdenv.lib.mapAttrs mkPdfSet { + lib.mapAttrs mkPdfSet { "ABMP15_3_nnlo" = "028q5xixxjxhb8sr7l5v5mwh9mkszm5m59fgnpb69yxvv40a70v0"; "ABMP15_4_nnlo" = "11zjp4dxmgp69kdkmdwqkpsajvwjrbwylmwgs56mgjb0vgb8wk0i"; "ABMP15_5_nnlo" = "0z47g5fwh53gg5ws5bbip5q2m5mm7vl09q2w58g6ah9dk25r10ll"; diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix index 1e31577026c..90cf5ac8b2d 100644 --- a/pkgs/development/libraries/physics/mela/default.nix +++ b/pkgs/development/libraries/physics/mela/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gfortran }: +{ lib, stdenv, fetchFromGitHub, gfortran }: stdenv.mkDerivation rec { pname = "mela"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "a Mellin Evolution LibrAry"; license = licenses.gpl3; homepage = "https://github.com/vbertone/MELA"; diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix index 20df49d9ae7..f84c1bda32d 100644 --- a/pkgs/development/libraries/physics/nlojet/default.nix +++ b/pkgs/development/libraries/physics/nlojet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "nlojet++"; @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.desy.de/~znagy/Site/NLOJet++.html"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; description = "Implementation of calculation of the hadron jet cross sections"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 53b2889a25c..1bec3300f80 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }: +{ lib, stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }: stdenv.mkDerivation rec { pname = "pythia"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--with-lhapdf6=${lhapdf}" - ] ++ (if stdenv.lib.versions.major hepmc.version == "3" then [ + ] ++ (if lib.versions.major hepmc.version == "3" then [ "--with-hepmc3=${hepmc}" ] else [ "--with-hepmc2=${hepmc}" @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { meta = { description = "A program for the generation of high-energy physics events"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "http://home.thep.lu.se/~torbjorn/Pythia.html"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix index 1c17b318c9d..834e3fcbba8 100644 --- a/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/pkgs/development/libraries/physics/qcdnum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, zlib }: +{ lib, stdenv, fetchurl, gfortran, zlib }: stdenv.mkDerivation rec { pname = "QCDNUM"; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { meta = { description = "A very fast QCD evolution program written in FORTRAN77"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; homepage = "https://www.nikhef.nl/~h24/qcdnum/index.html"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index f95328964bf..ce905bff17c 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, gsl, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: +{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, gsl, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: stdenv.mkDerivation rec { pname = "rivet"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-fastjet=${fastjet}" "--with-yoda=${yoda}" - ] ++ (if stdenv.lib.versions.major hepmc.version == "3" then [ + ] ++ (if lib.versions.major hepmc.version == "3" then [ "--with-hepmc3=${hepmc}" ] else [ "--with-hepmc=${hepmc}" @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A framework for comparison of experimental measurements from high-energy particle colliders to theory predictions"; license = licenses.gpl3; homepage = "https://rivet.hepforge.org"; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 876aeec0fab..d5a272955f4 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }: +{ lib, stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }: stdenv.mkDerivation rec { pname = "thepeg"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Toolkit for High Energy Physics Event Generation"; homepage = "https://herwig.hepforge.org/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 39bffb65237..bf53cfcb62c 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }: +{ lib, stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { pname = "yoda"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; buildInputs = [ python ] ++ (with python.pkgs; [ numpy matplotlib ]) - ++ stdenv.lib.optional withRootSupport root; + ++ lib.optional withRootSupport root; propagatedBuildInputs = [ zlib ]; enableParallelBuilding = true; @@ -35,10 +35,10 @@ stdenv.mkDerivation rec { meta = { description = "Provides small set of data analysis (specifically histogramming) classes"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; homepage = "https://yoda.hepforge.org"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; # https://gitlab.com/hepcedar/yoda/-/issues/24 broken = withRootSupport; }; diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix index 70ab98439cc..1e686b98004 100644 --- a/pkgs/development/libraries/pipewire/0.2.nix +++ b/pkgs/development/libraries/pipewire/0.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, doxygen, graphviz, valgrind +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, doxygen, graphviz, valgrind , glib, dbus, gst_all_1, alsaLib, ffmpeg_4, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf }: @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Server and user space API to deal with multimedia pipelines"; homepage = "https://pipewire.org/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index b8be63f8e53..fdd45b4bb0d 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Server and user space API to deal with multimedia pipelines"; homepage = "https://pipewire.org/"; license = licenses.mit; diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index ef9ae533ca1..a8cea463806 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libpng, glib /*just passthru*/ }: +{ lib, stdenv, fetchurl, pkg-config, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { pname = "pixman"; @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { buildInputs = [ libpng ]; - configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt"; + configureFlags = lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt"; doCheck = true; postInstall = glib.flattenInclude; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pixman.org"; description = "A low-level library for pixel manipulation"; license = licenses.mit; diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index debb0309e91..4148ca4fc47 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, openssl, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, openssl, autoreconfHook }: stdenv.mkDerivation rec { pname = "pkcs11-helper"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/OpenSC/pkcs11-helper"; license = with licenses; [ bsd3 gpl2 ]; description = "Library that simplifies the interaction with PKCS#11 providers"; diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/development/libraries/pkger/default.nix index 8c8fd4f8fd6..4d7c682f022 100644 --- a/pkgs/development/libraries/pkger/default.nix +++ b/pkgs/development/libraries/pkger/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Embed static files in Go binaries (replacement for gobuffalo/packr) "; homepage = "https://github.com/markbates/pkger"; changelog = "https://github.com/markbates/pkger/releases/tag/v${version}"; diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 2736de0630f..7a1c3971579 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, libGLU, libGL, freeglut, SDL +{ fetchurl, fetchpatch, lib, stdenv, libGLU, libGL, freeglut, SDL , libXi, libSM, libXmu, libXext, libX11 }: stdenv.mkDerivation rec { @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { GLUT, or FLTK instead of PLIB's 'PW' windowing library, you can. ''; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; homepage = "http://plib.sourceforge.net/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/plplot/default.nix b/pkgs/development/libraries/plplot/default.nix index e99ddc3dd08..05f12d0148b 100644 --- a/pkgs/development/libraries/plplot/default.nix +++ b/pkgs/development/libraries/plplot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "plplot"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform scientific graphics plotting library"; homepage = "https://plplot.org"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix index 3bd5aa46be5..01392f232d9 100644 --- a/pkgs/development/libraries/pmdk/default.nix +++ b/pkgs/development/libraries/pmdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoconf, libndctl, pkg-config }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { mv $out/lib $lib/lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Persistent Memory Development Kit"; homepage = "https://github.com/pmem/pmdk"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index f68833bdac4..bb8debbce91 100644 --- a/pkgs/development/libraries/pmix/default.nix +++ b/pkgs/development/libraries/pmix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, autoconf, automake +{ lib, stdenv, fetchFromGitHub, perl, autoconf, automake , libtool, flex, libevent, hwloc, munge, zlib, pandoc } : @@ -37,7 +37,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Process Management Interface for HPC environments"; homepage = "https://openpmix.github.io/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix index 7ae7406c989..dfd74e495e7 100644 --- a/pkgs/development/libraries/png++/default.nix +++ b/pkgs/development/libraries/png++/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpng +{ lib, stdenv, fetchurl, libpng , docSupport ? true, doxygen ? null }: assert docSupport -> doxygen != null; @@ -21,21 +21,21 @@ stdenv.mkDerivation rec { postCheck = "cat test/test.log"; - buildInputs = stdenv.lib.optional docSupport doxygen; + buildInputs = lib.optional docSupport doxygen; propagatedBuildInputs = [ libpng ]; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' substituteInPlace error.hpp --replace "#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" "#if (__clang__ || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" '' + '' sed "s|\(PNGPP := .\)|PREFIX := ''${out}\n\\1|" -i Makefile ''; - makeFlags = stdenv.lib.optional docSupport "docs"; + makeFlags = lib.optional docSupport "docs"; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nongnu.org/pngpp/"; description = "C++ wrapper for libpng library"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix index 71b36cedb81..18d5d0bcfa2 100644 --- a/pkgs/development/libraries/pocketsphinx/default.nix +++ b/pkgs/development/libraries/pocketsphinx/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , sphinxbase , pkg-config @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "Voice recognition library written in C"; homepage = "http://cmusphinx.sourceforge.net"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.free; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 1f2d43fce3c..8f963bb366a 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkg-config, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }: +{ lib, stdenv, fetchurl, cmake, pkg-config, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }: stdenv.mkDerivation rec { pname = "poco"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-DPOCO_UNBUNDLED=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pocoproject.org/"; description = "Cross-platform C++ libraries with a network/internet focus"; license = licenses.boost; diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index ba743bb6053..e50a2111b43 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig +{ lib, stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig , openssl, libpng, lua5, pkg-config, libidn, expat, fetchpatch }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { moveToOutput lib "$lib" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://podofo.sourceforge.net"; description = "A library to work with the PDF file format"; platforms = platforms.all; diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix index a758146d406..0da6e15eb27 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, cmake, pkg-config, polkit, automoc4, glib, qt4 }: +{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, automoc4, glib, qt4 }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "polkit-qt-1-qt4-0.112.0"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Qt wrapper around PolKit"; maintainers = [ maintainers.ttuegel ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/polkit-qt-1/qt-5.nix b/pkgs/development/libraries/polkit-qt-1/qt-5.nix index 76efca9717b..be425b39401 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-5.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-5.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, cmake, pkg-config, polkit, glib, qtbase }: +{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, glib, qtbase }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "polkit-qt-1-qt5-0.112.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "A Qt wrapper around PolKit"; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [ ttuegel ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 6382097d398..7e8e95ef1ea 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, glib, expat, pam, perl, fetchpatch +{ lib, stdenv, fetchurl, pkg-config, glib, expat, pam, perl, fetchpatch , intltool, spidermonkey_78, gobject-introspection, libxslt, docbook_xsl, dbus , docbook_xml_dtd_412, gtk-doc, coreutils , useSystemd ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl), systemd, elogind @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5dd4e22efd05d55833c4634b56e473812b5acbf2.patch"; sha256 = "17lv7xj5ksa27iv4zpm4zwd4iy8zbwjj4ximslfq3sasiz9kxhlp"; }) - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # Make netgroup support optional (musl does not have it) # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10 # We use the version of the patch that Alpine uses successfully. @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' sed -i -e "s/-Wl,--as-needed//" configure.ac ''; @@ -57,8 +57,8 @@ stdenv.mkDerivation rec { buildInputs = [ expat pam spidermonkey_78 ] # On Linux, fall back to elogind when systemd support is off. - ++ stdenv.lib.optional stdenv.isLinux (if useSystemd then systemd else elogind) - ++ stdenv.lib.optional withIntrospection gobject-introspection; + ++ lib.optional stdenv.isLinux (if useSystemd then systemd else elogind) + ++ lib.optional withIntrospection gobject-introspection; propagatedBuildInputs = [ glib # in .pc Requires @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { --replace /bin/true ${coreutils}/bin/true \ --replace /bin/false ${coreutils}/bin/false - '' + stdenv.lib.optionalString useSystemd /* bogus chroot detection */ '' + '' + lib.optionalString useSystemd /* bogus chroot detection */ '' sed '/libsystemd autoconfigured/s/.*/:/' -i configure ''; @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { "--with-polkitd-user=polkituser" #TODO? config.ids.uids.polkituser "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS (if withIntrospection then "--enable-introspection" else "--disable-introspection") - ] ++ stdenv.lib.optional (!doCheck) "--disable-test"; + ] ++ lib.optional (!doCheck) "--disable-test"; makeFlags = [ "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0" @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS make check' ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.freedesktop.org/wiki/Software/polkit"; description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/poly2tri-c/default.nix b/pkgs/development/libraries/poly2tri-c/default.nix index 60d75d340e6..1f0ee81da95 100644 --- a/pkgs/development/libraries/poly2tri-c/default.nix +++ b/pkgs/development/libraries/poly2tri-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkg-config @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { "-Wno-error" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for generating, refining and rendering 2-Dimensional Constrained Delaunay Triangulations"; homepage = "https://code.google.com/archive/p/poly2tri-c/"; license = licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ jtojnar ]; + maintainers = with lib.maintainers; [ jtojnar ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix index bc141075973..a49bfad7ab3 100644 --- a/pkgs/development/libraries/poppler/0.61.nix +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkg-config ]; # Not sure when and how to pass it. It seems an upstream bug anyway. - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; cmakeFlags = [ (mkFlag true "XPDF_HEADERS") diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 80d5ba19d2b..3f2b8453d7f 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkg-config ]; # Workaround #54606 - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index b04a2242ab7..393ef2c2c33 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "popt"; @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77"; }; - patches = stdenv.lib.optionals stdenv.isCygwin [ + patches = lib.optionals stdenv.isCygwin [ ./1.16-cygwin.patch ./1.16-vpath.patch ]; doCheck = false; # fails - meta = with stdenv.lib; { + meta = with lib; { description = "Command line option parsing library"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index da4c3933aaa..c7de116e879 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, pkg-config, libjack2 +{ lib, stdenv, fetchurl, alsaLib, pkg-config, libjack2 , AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }: stdenv.mkDerivation { @@ -11,15 +11,15 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 ] - ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; + ++ lib.optional (!stdenv.isDarwin) alsaLib; configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays"; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + patchPhase = lib.optionalString stdenv.isDarwin '' sed -i '50 i\ #include \ #include \ @@ -30,14 +30,14 @@ stdenv.mkDerivation { # not sure why, but all the headers seem to be installed by the make install installPhase = '' make install - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' # fixup .pc file to find alsa library sed -i "s|-lasound|-L${alsaLib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' cp include/pa_mac_core.h $out/include/pa_mac_core.h ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Portable cross-platform Audio API"; homepage = "http://www.portaudio.com/"; # Not exactly a bsd license, but alike diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index d96e15edd81..e9a868240bb 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }: +{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }: stdenv.mkDerivation rec { pname = "portmidi"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; # XXX: This is to deactivate Java support. - patches = stdenv.lib.singleton (fetchurl { + patches = lib.singleton (fetchurl { url = "https://raw.github.com/Rogentos/argent-gentoo/master/media-libs/" + "portmidi/files/portmidi-217-cmake-libdir-java-opts.patch"; sha256 = "1jbjwan61iqq9fqfpq2a4fd30k3clg7a6j0gfgsw87r8c76kqf6h"; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://portmedia.sourceforge.net/portmidi/"; description = "Platform independent library for MIDI I/O"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index f1c93e0fa7c..a94cf9e38d0 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, gmpxx, perl, gnum4 }: +{ fetchurl, fetchpatch, lib, stdenv, gmpxx, perl, gnum4 }: let version = "1.2"; in @@ -21,7 +21,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ gmpxx ]; configureFlags = [ "--disable-watchdog" ] ++ - stdenv.lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.isDarwin [ "CPPFLAGS=-fexceptions" "--disable-ppl_lcdd" "--disable-ppl_lpsol" "--disable-ppl_pips" ]; @@ -53,9 +53,9 @@ stdenv.mkDerivation { homepage = "http://bugseng.com/products/ppl/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix index d40b4442e38..4275622c24f 100644 --- a/pkgs/development/libraries/prison/default.nix +++ b/pkgs/development/libraries/prison/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qrencode, qt4, libdmtx }: +{ lib, stdenv, fetchurl, cmake, qrencode, qt4, libdmtx }: let v = "1.0"; in @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt4 library for QR-codes"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/development/libraries/proj-datumgrid/default.nix index c7a25f62171..93e415f6269 100644 --- a/pkgs/development/libraries/proj-datumgrid/default.nix +++ b/pkgs/development/libraries/proj-datumgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "proj-datumgrid"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp nad2bin $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Repository for proj datum grids"; homepage = "https://proj4.org"; license = licenses.mit; diff --git a/pkgs/development/libraries/proj/5.2.nix b/pkgs/development/libraries/proj/5.2.nix index 7a97491d8ea..ee76c668716 100644 --- a/pkgs/development/libraries/proj/5.2.nix +++ b/pkgs/development/libraries/proj/5.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "proj-5.2.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { doCheck = stdenv.is64bit; - meta = with stdenv.lib; { + meta = with lib; { description = "Cartographic Projections Library"; homepage = "https://proj4.org"; license = licenses.mit; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 8618d62e834..22d6206fd85 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook }: stdenv.mkDerivation rec { pname = "proj"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.is64bit; - meta = with stdenv.lib; { + meta = with lib; { description = "Cartographic Projections Library"; homepage = "https://proj4.org"; license = licenses.mit; diff --git a/pkgs/development/libraries/prometheus-client-c/default.nix b/pkgs/development/libraries/prometheus-client-c/default.nix index 57f4ef5956f..9b18b25c726 100644 --- a/pkgs/development/libraries/prometheus-client-c/default.nix +++ b/pkgs/development/libraries/prometheus-client-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -50,9 +50,9 @@ let meta = { homepage = "https://github.com/digitalocean/prometheus-client-c/"; inherit description; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.cfsmp3 ]; + platforms = lib.platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.cfsmp3 ]; }; }; in diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix index 3714e2c89e6..173ee6d2e09 100644 --- a/pkgs/development/libraries/prometheus-cpp/default.nix +++ b/pkgs/development/libraries/prometheus-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , gbenchmark @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "Prometheus Client Library for Modern C++"; homepage = "https://github.com/jupp0r/prometheus-cpp"; - license = [ stdenv.lib.licenses.mit ]; + license = [ lib.licenses.mit ]; }; } diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/development/libraries/properties-cpp/default.nix index 54fea18fd17..431e6348b3f 100644 --- a/pkgs/development/libraries/properties-cpp/default.nix +++ b/pkgs/development/libraries/properties-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , pkg-config @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtest doxygen graphviz lcov ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://launchpad.net/properties-cpp"; description = "A very simple convenience library for handling properties and signals in C++11"; license = licenses.lgpl3Only; diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 4166aac7246..f31a7868d5e 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook, zlib, gmock, buildPackages , version, sha256 @@ -25,7 +25,7 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { chmod -R a+w gmock chmod -R a+w googletest ln -s ../googletest gmock/gtest - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/google/protobuf/testing/googletest.cc \ --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; @@ -48,8 +48,8 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. ''; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; homepage = "https://developers.google.com/protocol-buffers/"; }; diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 32d6f70d1eb..7d64df43626 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, version, src +{ lib, stdenv, version, src , autoreconfHook, zlib, gtest , ... }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { rm -rf gtest cp -r ${gtest.src}/googletest gtest chmod -R a+w gtest - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/google/protobuf/testing/googletest.cc \ --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; @@ -54,7 +54,7 @@ stdenv.mkDerivation { ''; license = "mBSD"; homepage = "https://developers.google.com/protocol-buffers/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; passthru.version = version; diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index c9c246f1910..b64d75076ba 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, src, version +{ lib, stdenv, src, version , autoreconfHook, pkg-config, protobuf, zlib , ... }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ protobuf zlib ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/protobuf-c/protobuf-c/"; description = "C bindings for Google's Protocol Buffers"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/prototypejs/default.nix b/pkgs/development/libraries/prototypejs/default.nix index 3753dfacac3..81e72036694 100644 --- a/pkgs/development/libraries/prototypejs/default.nix +++ b/pkgs/development/libraries/prototypejs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ... }: +{ lib, stdenv, fetchurl, ... }: let version = "1.7.3.0"; in fetchurl { @@ -6,7 +6,7 @@ in fetchurl { url = "https://ajax.googleapis.com/ajax/libs/prototype/${version}/prototype.js"; sha256 = "0q43vvrsb22h4jvavs1gk3v4ps61yx9k85b5n6q9mxivhmxprg26"; - meta = with stdenv.lib; { + meta = with lib; { description = "A foundation for ambitious web user interfaces"; longDescription = '' Prototype takes the complexity out of client-side web diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix index 1c8e7e99313..6bff5998b56 100644 --- a/pkgs/development/libraries/protozero/default.nix +++ b/pkgs/development/libraries/protozero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "protozero"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimalistic protocol buffer decoder and encoder in C++"; homepage = "https://github.com/mapbox/protozero"; license = with licenses; [ bsd2 asl20 ]; diff --git a/pkgs/development/libraries/pslib/default.nix b/pkgs/development/libraries/pslib/default.nix index 35c4f7c3b2d..ec2362009ff 100644 --- a/pkgs/development/libraries/pslib/default.nix +++ b/pkgs/development/libraries/pslib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkg-config, zlib, libpng, libjpeg, libungif, libtiff +{ lib, stdenv, fetchurl, cmake, pkg-config, zlib, libpng, libjpeg, libungif, libtiff }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { cp -r ../doc/. $doc/share/doc/${pname} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A C-library for generating multi page PostScript documents"; homepage = "http://pslib.sourceforge.net/"; changelog = diff --git a/pkgs/development/libraries/psol/generic.nix b/pkgs/development/libraries/psol/generic.nix index c61926fe13f..57784c3a502 100644 --- a/pkgs/development/libraries/psol/generic.nix +++ b/pkgs/development/libraries/psol/generic.nix @@ -1,4 +1,4 @@ -{ fetchzip, stdenv }: +{ fetchzip, lib, stdenv }: { version, sha256 }: { inherit version; } // fetchzip { inherit sha256; @@ -8,9 +8,9 @@ meta = { description = "PageSpeed Optimization Libraries"; homepage = "https://developers.google.com/speed/pagespeed/psol"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; # WARNING: This only works with Linux because the pre-built PSOL binary is only supplied for Linux. # TODO: Build PSOL from source to support more platforms. - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix index 43da67d3d9b..82ee5c3ae44 100644 --- a/pkgs/development/libraries/psqlodbc/default.nix +++ b/pkgs/development/libraries/psqlodbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiodbc, postgresql, openssl }: +{ lib, stdenv, fetchurl, libiodbc, postgresql, openssl }: stdenv.mkDerivation rec { name = "psqlodbc-09.01.0200"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-iodbc=${libiodbc}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://odbc.postgresql.org/"; description = "ODBC driver for PostgreSQL"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/pstreams/default.nix b/pkgs/development/libraries/pstreams/default.nix index e3cb9dd67a3..bb9b6bc9c84 100644 --- a/pkgs/development/libraries/pstreams/default.nix +++ b/pkgs/development/libraries/pstreams/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit }: @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.code.sf.net/p/pstreams/code"; - rev = let dot2Underscore = stdenv.lib.strings.stringAsChars (c: if c == "." then "_" else c); + rev = let dot2Underscore = lib.strings.stringAsChars (c: if c == "." then "_" else c); in "RELEASE_${dot2Underscore version}"; sha256 = "0r8aj0nh5mkf8cvnzl8bdy4nm7i74vs83axxfimcd74kjfn0irys"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # `make install` fails on case-insensitive file systems (e.g. APFS by # default) because this target exists - meta = with stdenv.lib; { + meta = with lib; { description = "POSIX Process Control in C++"; longDescription = '' PStreams allows you to run another program from your C++ application and diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix index 09b3ce23e08..3f62d672ea9 100644 --- a/pkgs/development/libraries/ptex/default.nix +++ b/pkgs/development/libraries/ptex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec echo v${version} >version ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Per-Face Texture Mapping for Production Rendering"; homepage = "http://ptex.us/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index c64d0b37686..240c903a8a7 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "pth-2.0.7"; @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; }; - preConfigure = stdenv.lib.optionalString stdenv.isAarch32 '' + preConfigure = lib.optionalString stdenv.isAarch32 '' configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") - '' + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' + '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' configureFlagsArray+=("ac_cv_check_sjlj=ssjlj") ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The GNU Portable Threads library"; homepage = "https://www.gnu.org/software/pth"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index 4930b222d03..15000564637 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoreconfHook, pkg-config }: +{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "libupnp"; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = "BSD-style"; homepage = "http://pupnp.sourceforge.net/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/pxlib/default.nix b/pkgs/development/libraries/pxlib/default.nix index 2624c718d27..3acaf8bac15 100644 --- a/pkgs/development/libraries/pxlib/default.nix +++ b/pkgs/development/libraries/pxlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool }: +{ lib, stdenv, fetchurl, intltool }: stdenv.mkDerivation rec { pname = "pxlib"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to read and write Paradox files"; homepage = "http://pxlib.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix index 047142c8a5d..58d38651a76 100644 --- a/pkgs/development/libraries/pyotherside/default.nix +++ b/pkgs/development/libraries/pyotherside/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , python3, qmake, qtbase, qtquickcontrols, qtsvg, ncurses }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./qml-path.patch ]; installTargets = [ "sub-src-install_subtargets" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Asynchronous Python 3 Bindings for Qt 5"; homepage = "https://thp.io/2011/pyotherside/"; license = licenses.isc; diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 6f2550ca9ac..bd778f1a945 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, qmake, +{ lib, stdenv, fetchurl, python, qmake, qtwebengine, qtxmlpatterns, qttools, unzip }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { cp -r ./extensions $out/include/PythonQt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications"; homepage = "http://pythonqt.sourceforge.net/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index c735b15336a..2b16f0f09b0 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }: +{ lib, stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }: stdenv.mkDerivation rec { pname = "qca-qt5"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # Without this patch cmake fails with a "No known features for CXX compiler" # error on darwin - patches = stdenv.lib.optional stdenv.isDarwin ./move-project.patch ; + patches = lib.optional stdenv.isDarwin ./move-project.patch ; # tells CMake to use this CA bundle file if it is accessible preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt''; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox) cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt 5 Cryptographic Architecture"; homepage = "http://delta.affinix.com/qca"; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index b637b491387..42dcf1a87d3 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, cmake, pkg-config, qt, darwin }: +{ lib, stdenv, fetchurl, openssl, cmake, pkg-config, qt, darwin }: stdenv.mkDerivation rec { pname = "qca"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl qt ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; # tells CMake to use this CA bundle file if it is accessible preConfigure = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt Cryptographic Architecture"; license = "LGPL"; homepage = "http://delta.affinix.com/qca"; diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 689a4877541..78e11135311 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation { name = "qhull-2016.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.qhull.org/"; description = "Compute the convex hull, Delaunay triangulation, Voronoi diagram and more"; license = licenses.qhull; diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 899f1d1f00b..709a3fb1533 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, qt4}: +{lib, stdenv, fetchurl, cmake, qt4}: let pn = "qimageblitz"; @@ -20,8 +20,8 @@ stdenv.mkDerivation { meta = { description = "Graphical effect and filter library for KDE4"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; homepage = "http://${pn}.sourceforge.net"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index ee1c36c3244..a6ee272a38b 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, qt4 }: +{ lib, stdenv, fetchFromGitHub, cmake, qt4 }: stdenv.mkDerivation rec { version = "0.9.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ qt4 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight data-interchange format"; homepage = "http://qjson.sourceforge.net/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix index 03247f9d695..88c94543045 100644 --- a/pkgs/development/libraries/qmlbox2d/default.nix +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -1,4 +1,4 @@ -{stdenv, qtdeclarative, fetchFromGitHub, qmake }: +{lib, stdenv, qtdeclarative, fetchFromGitHub, qmake }: stdenv.mkDerivation { name = "qml-box2d-2018-04-06"; src = fetchFromGitHub { @@ -21,7 +21,7 @@ stdenv.mkDerivation { installFlags = [ "INSTALL_ROOT=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A QML plugin for Box2D engine"; homepage = "https://github.com/qml-box2d/qml-box2d"; maintainers = [ maintainers.guibou ]; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 53e83182c2b..75f95a53800 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp, fetchpatch }: stdenv.mkDerivation { version = "2018-11-24"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ qtbase qtquick1 qtmultimedia ] - ++ stdenv.lib.optional stdenv.isDarwin utmp; + ++ lib.optional stdenv.isDarwin utmp; nativeBuildInputs = [ qmake ]; patches = [ @@ -35,8 +35,8 @@ stdenv.mkDerivation { meta = { description = "A QML port of qtermwidget"; homepage = "https://github.com/Swordfish90/qmltermwidget"; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ skeidel ]; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ skeidel ]; }; } diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 41e4b80d9c3..8afa19c229f 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qmake, qca-qt5 }: +{ lib, stdenv, fetchurl, qtbase, qmake, qca-qt5 }: stdenv.mkDerivation { name = "qoauth-2.0.0"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto"; NIX_LDFLAGS = "-lqca-qt5"; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt library for OAuth authentication"; inherit (qtbase.meta) platforms; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index a427bd5d051..aba9e77691a 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libjpeg, zlib, perl }: +{ lib, stdenv, fetchFromGitHub, libjpeg, zlib, perl }: stdenv.mkDerivation rec { pname = "qpdf"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://qpdf.sourceforge.net/"; description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files"; license = licenses.asl20; # as of 7.0.0, people may stay at artistic2 diff --git a/pkgs/development/libraries/qrcodegen/default.nix b/pkgs/development/libraries/qrcodegen/default.nix index b5faaf90ef7..80ce9e1d0f8 100644 --- a/pkgs/development/libraries/qrcodegen/default.nix +++ b/pkgs/development/libraries/qrcodegen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "qrcodegen"; version = "1.6.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp qrcodegen.h $out/include/qrcodegen/ ''; - meta = with stdenv.lib; + meta = with lib; { description = "qrcode generator library in multiple languages"; diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix index 3b4764151e3..c005b835a93 100644 --- a/pkgs/development/libraries/qrencode/default.nix +++ b/pkgs/development/libraries/qrencode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv }: +{ lib, stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv }: stdenv.mkDerivation rec { pname = "qrencode"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL2 libpng ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ SDL2 libpng ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; configureFlags = [ "--with-tests" @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fukuchi.org/works/qrencode/"; description = "C library for encoding data in a QR Code symbol"; diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index b941021cb68..3e4109b1bf0 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , gfortran , blas @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "LAPACK=-L${lapack}/lib -llapack" "BLAS=-L${blas}/lib -lblas" "PREFIX=${placeholder "out"}" - ${stdenv.lib.optionalString blas.isILP64 + ${lib.optionalString blas.isILP64 # If another application intends to use qrupdate compiled with blas with # 64 bit support, it should add this to it's FFLAGS as well. See (e.g): # https://savannah.gnu.org/bugs/?50339 @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { buildFlags = [ "lib" "solib" ]; - installTargets = stdenv.lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ]; + installTargets = lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ]; buildInputs = [ gfortran ]; nativeBuildInputs = [ which ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for fast updating of qr and cholesky decompositions"; homepage = "https://sourceforge.net/projects/qrupdate/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 19aebd715d6..26a3c2e36d3 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { --replace '$$[QT_INSTALL_DATA]' $out/share${lib.optionalString (! withQt5) "/qt"} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Qt port of the Scintilla text editing library"; longDescription = '' QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index f5837717622..0bc7d938be6 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , xftSupport ? true, libXft ? null , xrenderSupport ? true, libXrender ? null , xrandrSupport ? true, libXrandr ? null @@ -6,8 +6,8 @@ , cursorSupport ? true, libXcursor ? null , threadSupport ? true , mysqlSupport ? false, libmysqlclient ? null -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms -, openglSupport ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, openglSupport ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGL ? null, libGLU ? null, libXmu ? null , xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which }: @@ -37,7 +37,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; configureFlags = let - mk = cond: name: "-${stdenv.lib.optionalString (!cond) "no-"}${name}"; + mk = cond: name: "-${lib.optionalString (!cond) "no-"}${name}"; in [ "-v" "-system-zlib" "-system-libpng" "-system-libjpeg" @@ -49,21 +49,21 @@ stdenv.mkDerivation { (mk xineramaSupport "xinerama") (mk xrandrSupport "xrandr") (mk xftSupport "xft") - ] ++ stdenv.lib.optionals openglSupport [ + ] ++ lib.optionals openglSupport [ "-dlopen-opengl" "-L${libGL}/lib" "-I${libGLU}/include" "-L${libXmu.out}/lib" "-I${libXmu.dev}/include" - ] ++ stdenv.lib.optionals xrenderSupport [ + ] ++ lib.optionals xrenderSupport [ "-L${libXrender.out}/lib" "-I${libXrender.dev}/include" - ] ++ stdenv.lib.optionals xrandrSupport [ + ] ++ lib.optionals xrandrSupport [ "-L${libXrandr.out}/lib" "-I${libXrandr.dev}/include" - ] ++ stdenv.lib.optionals xineramaSupport [ + ] ++ lib.optionals xineramaSupport [ "-L${libXinerama.out}/lib" "-I${libXinerama.dev}/include" - ] ++ stdenv.lib.optionals cursorSupport [ + ] ++ lib.optionals cursorSupport [ "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" - ] ++ stdenv.lib.optionals mysqlSupport [ + ] ++ lib.optionals mysqlSupport [ "-qt-sql-mysql" "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" - ] ++ stdenv.lib.optionals xftSupport [ + ] ++ lib.optionals xftSupport [ "-L${libXft.out}/lib" "-I${libXft.dev}/include" "-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include" "-L${libXft.fontconfig.lib}/lib" "-I${libXft.fontconfig.dev}/include" @@ -85,7 +85,7 @@ stdenv.mkDerivation { passthru = {inherit mysqlSupport;}; - meta = with stdenv.lib; { + meta = with lib; { license = with licenses; [ gpl2 qpl ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index c92218f9fe5..9ddb2cc5bac 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -4,7 +4,7 @@ , libmng, which, libGLU, openssl, dbus, cups, pkg-config , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi , alsaLib -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , flashplayerFix ? false, gdk-pixbuf , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2 , gnomeStyle ? false, libgnomeui, GConf, gnome_vfs diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix index ba44a217e3d..60c1d2754d7 100644 --- a/pkgs/development/libraries/qt-mobility/default.nix +++ b/pkgs/development/libraries/qt-mobility/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qt4, libX11, coreutils, bluez, perl }: +{ lib, stdenv, fetchFromGitHub, qt4, libX11, coreutils, bluez, perl }: # possible additional dependencies: pulseaudio udev networkmanager immerson qmf stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 libX11 bluez perl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt Mobility"; homepage = "http://qt.nokia.com/products/qt-addons/mobility"; maintainers = [ maintainers.qknight ]; diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 60eb19ac0c7..6da4abb756e 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, qt4 ? null +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qt4 ? null , withQt5 ? false, qtbase ? null, qttools ? null , darwin ? null , libsecret @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pkg-config ] # for finding libsecret + ++ lib.optionals (!stdenv.isDarwin) [ pkg-config ] # for finding libsecret ; - buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ libsecret ] + buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]) - ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]) ; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Platform-independent Qt API for storing passwords securely"; homepage = "https://github.com/frankosterfeld/qtkeychain"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index ecff7f7f821..3558201015c 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, protobuf }: +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, protobuf }: stdenv.mkDerivation rec { pname = "qtpbfimageplugin"; @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { # Fix plugin dir substituteInPlace pbfplugin.pro \ --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # Fix darwin build substituteInPlace pbfplugin.pro \ --replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt image plugin for displaying Mapbox vector tiles"; longDescription = '' QtPBFImagePlugin is a Qt image plugin that enables applications capable of diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index a6cffd73c3f..0164f8884a2 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4 }: +{ lib, stdenv, fetchurl, qt4 }: stdenv.mkDerivation { name = "qtscriptgenerator-0.1.0"; @@ -43,6 +43,6 @@ stdenv.mkDerivation { description = "QtScript bindings generator"; homepage = "https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/"; inherit (qt4.meta) platforms; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index a5c96dc351b..7290b3830d0 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake4Hook , qt4, libX11, libXext }: +{ lib, stdenv, fetchFromGitHub, qmake4Hook , qt4, libX11, libXext }: stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mv $TMP/kvantum/${qt4}/lib $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "SVG-based Qt4 theme engine"; homepage = "https://github.com/tsujan/Kvantum"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 71ca8e720a4..c2fa32b6d05 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem , libX11, libXext, qttools, wrapQtAppsHook }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "SVG-based Qt5 theme engine plus a config tool and extra themes"; homepage = "https://github.com/tsujan/Kvantum"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index 7f340ce1eef..84d7f46a2b2 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }: mkDerivation { name = "qtstyleplugins-2017-03-11"; @@ -15,7 +15,7 @@ mkDerivation { nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ gtk2 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Additional style plugins for Qt5, including BB10, GTK, Cleanlooks, Motif, Plastique"; homepage = "http://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 9c9352d3c29..c44e8f4fd87 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cpp-utilities, qttools, qtbase, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cpp-utilities, qttools, qtbase, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "qtutilities"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase cpp-utilities ]; nativeBuildInputs = [ cmake qttools ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Martchus/qtutilities"; description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix index d1b921deac0..652c49aa6ca 100644 --- a/pkgs/development/libraries/qtwebkit-plugins/default.nix +++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }: +{ lib, stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }: stdenv.mkDerivation { name = "qtwebkit-plugins-2017-01-25"; @@ -15,11 +15,11 @@ stdenv.mkDerivation { buildInputs = [ qtwebkit hunspell ]; postPatch = '' - sed -i "s,-lhunspell,-lhunspell-${stdenv.lib.versions.majorMinor hunspell.version}," src/spellcheck/spellcheck.pri + sed -i "s,-lhunspell,-lhunspell-${lib.versions.majorMinor hunspell.version}," src/spellcheck/spellcheck.pri sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," src/src.pro ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Spell checking plugin using Hunspell and HTML5 Notifications plugin for QtWebKit"; homepage = "https://github.com/QupZilla/qtwebkit-plugins"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index c399298b8f8..3f186314d01 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, zlib, qtbase, cmake, fixDarwinDylibNames }: +{ fetchFromGitHub, lib, stdenv, zlib, qtbase, cmake, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "quazip"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ zlib qtbase ]; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides access to ZIP archives from Qt programs"; license = licenses.lgpl21Plus; homepage = "https://stachenov.github.io/quazip/"; # Migrated from http://quazip.sourceforge.net/ diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index 6aebb7a6511..1a4fcca9d9b 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU, libGL, glew, freetype, fontconfig, fribidi, libX11 }: +{ lib, stdenv, fetchurl, libGLU, libGL, glew, freetype, fontconfig, fribidi, libX11 }: stdenv.mkDerivation rec { pname = "quesoglc"; version = "0.7.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libGLU libGL glew freetype fontconfig fribidi libX11 ]; # FIXME: Configure fails to use system glew. - meta = with stdenv.lib; { + meta = with lib; { description = "A free implementation of the OpenGL Character Renderer"; longDescription = '' QuesoGLC is a free (as in free speech) implementation of the OpenGL diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix index e5346b42b9f..28933f96fa1 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/development/libraries/quickder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages, hexio +{ lib, stdenv, fetchFromGitHub, python2Packages, hexio , cmake, bash, arpa2cm, git, asn2quickder }: stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { export PREFIX=$out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Quick (and Easy) DER, a Library for parsing ASN.1"; homepage = "https://github.com/vanrein/quick-der"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/quickfix/default.nix b/pkgs/development/libraries/quickfix/default.nix index 5e7300ee19c..6644b9885c2 100644 --- a/pkgs/development/libraries/quickfix/default.nix +++ b/pkgs/development/libraries/quickfix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "quickfix"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace 'UnitTest++' ' ' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "QuickFIX C++ Fix Engine Library"; homepage = "http://www.quickfixengine.org"; license = licenses.free; # similar to BSD 4-clause diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index 1a29bb90fbb..edfd3b4e24a 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: +{ lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: stdenv.mkDerivation rec { name = "qwt-6.1.5"; @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) - license = stdenv.lib.licenses.qwt; + license = lib.licenses.qwt; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; branch = "6"; diff --git a/pkgs/development/libraries/qwt/6_qt4.nix b/pkgs/development/libraries/qwt/6_qt4.nix index 4b7aa9cf7f9..61903af93fa 100644 --- a/pkgs/development/libraries/qwt/6_qt4.nix +++ b/pkgs/development/libraries/qwt/6_qt4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, AGL }: +{ lib, stdenv, fetchurl, qt4, qmake4Hook, AGL }: stdenv.mkDerivation rec { name = "qwt-6.1.5"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ AGL ]; + ] ++ lib.optionals stdenv.isDarwin [ AGL ]; nativeBuildInputs = [ qmake4Hook ]; @@ -22,18 +22,18 @@ stdenv.mkDerivation rec { # qwt.framework output includes a relative reference to itself, which breaks dependents preFixup = - stdenv.lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.isDarwin '' echo "Attempting to repair qwt" install_name_tool -id "$out/lib/qwt.framework/Versions/6/qwt" "$out/lib/qwt.framework/Versions/6/qwt" ''; qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) - license = stdenv.lib.licenses.qwt; + license = lib.licenses.qwt; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; branch = "6"; diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index c206ffdd5db..e158fe34885 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ lib, stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "qwt-5.2.3"; @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { qmakeFlags="$qmakeFlags INSTALLBASE=$out -after doc.path=$out/share/doc/${name}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) - license = stdenv.lib.licenses.qwt; + license = lib.licenses.qwt; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix index 503e1b14c1f..9d035ce9d89 100644 --- a/pkgs/development/libraries/qxt/default.nix +++ b/pkgs/development/libraries/qxt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, which, coreutils, fetchzip, qt4 }: +{ lib, stdenv, which, coreutils, fetchzip, qt4 }: stdenv.mkDerivation rec { pname = "qxt"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { classes to add functionality not readily available in the Qt toolkit by Qt Development Frameworks, Nokia. ''; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ forkk ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ forkk ]; broken = true; }; } diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 7cb29357c49..94a9adcae87 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }: +{ lib, stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }: stdenv.mkDerivation rec { pname = "rabbitmq-c"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ openssl popt xmlto ]; - meta = with stdenv.lib; { + meta = with lib; { description = "RabbitMQ C AMQP client library"; homepage = "https://github.com/alanxz/rabbitmq-c"; license = licenses.mit; diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index e84770ec0f5..b649b1d9c11 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ant, jdk, jre, python, makeWrapper }: +{ fetchurl, lib, stdenv, ant, jdk, jre, python, makeWrapper }: stdenv.mkDerivation { name = "rabbitmq-java-client-3.3.4"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { --add-flags "-Djava.awt.headless=true -cp $out/share/java/\* com.rabbitmq.examples.PerfTest" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers"; homepage = "https://www.rabbitmq.com/java-client.html"; license = with licenses; [ mpl11 gpl2 ]; diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index 5d7e94ff0aa..69fa7f6eadc 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv }: stdenv.mkDerivation rec { pname = "raft-canonical"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - meta = with stdenv.lib; { + meta = with lib; { description = '' Fully asynchronous C implementation of the Raft consensus protocol ''; diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix index 6de7ecdfef3..8e99ca1be35 100644 --- a/pkgs/development/libraries/randomx/default.nix +++ b/pkgs/development/libraries/randomx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "randomX"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "13h2cw8drq7xn3v8fbpxrlsl8zq3fs8gd2pc1pv28ahr9qqjz1gc"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Proof of work algorithm based on random code execution"; homepage = "https://github.com/tevador/RandomX"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/rang/default.nix b/pkgs/development/libraries/rang/default.nix index b3d300baca2..79ab52fc835 100644 --- a/pkgs/development/libraries/rang/default.nix +++ b/pkgs/development/libraries/rang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "rang"; version = "v3.1.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { "sha256" = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s"; }; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Minimal, Header only Modern c++ library for terminal goodies"; homepage = "https://agauniyal.github.io/rang/"; diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index 47c56aaa1e8..1e9df5be234 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "range-v3"; @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { # Building the tests currently fails on AArch64 due to internal compiler # errors (with GCC 9.2): - cmakeFlags = stdenv.lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF"; + cmakeFlags = lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF"; doCheck = !stdenv.isAarch64; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Experimental range library for C++11/14/17"; homepage = "https://github.com/ericniebler/range-v3"; changelog = "https://github.com/ericniebler/range-v3/releases/tag/${version}"; diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix index 571566909c4..4df98c3026e 100644 --- a/pkgs/development/libraries/rapidcheck/default.nix +++ b/pkgs/development/libraries/rapidcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ lib, stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "rapidcheck"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { rm $out/extras/**/CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A C++ framework for property based testing inspired by QuickCheck"; inherit (src.meta) homepage; maintainers = with maintainers; [ jb55 ]; diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix index ca072f2ca4b..e5ae16087cb 100644 --- a/pkgs/development/libraries/rapidxml/default.nix +++ b/pkgs/development/libraries/rapidxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "rapidxml"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp * $out/include/${pname} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast XML DOM-style parser in C++"; homepage = "http://rapidxml.sourceforge.net/"; license = licenses.boost; diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index 291454f1410..522456cfa40 100644 --- a/pkgs/development/libraries/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}: +{lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}: let pname = "rarian"; version = "0.8.1"; @@ -6,7 +6,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.gz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.gz"; sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; }; @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Documentation metadata library based on the proposed Freedesktop.org spec"; homepage = "https://rarian.freedesktop.org/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 0da318808f3..2a4f9973bde 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, perl, pkg-config, python, openssl }: +{ lib, stdenv, fetchFromGitHub, zlib, perl, pkg-config, python, openssl }: stdenv.mkDerivation rec { pname = "rdkafka"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "librdkafka - Apache Kafka C/C++ client library"; homepage = "https://github.com/edenhill/librdkafka"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index d36b24d6108..faa576faa0d 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "re2"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/google/re2"; description = "An efficient, principled regular expression library"; - license = stdenv.lib.licenses.bsd3; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.bsd3; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix index 5833ca714e4..b2eab66387f 100644 --- a/pkgs/development/libraries/readline/5.x.nix +++ b/pkgs/development/libraries/readline/5.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation { name = "readline-5.2"; @@ -10,9 +10,9 @@ stdenv.mkDerivation { propagatedBuildInputs = [ncurses]; - patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch; + patches = lib.optional stdenv.isDarwin ./shobj-darwin.patch; - meta = with stdenv.lib; { + meta = with lib; { branch = "5"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix index 3f3ca01961d..98db664dd8f 100644 --- a/pkgs/development/libraries/readline/6.2.nix +++ b/pkgs/development/libraries/readline/6.2.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses +{ fetchurl, lib, stdenv, ncurses }: stdenv.mkDerivation (rec { @@ -47,11 +47,11 @@ stdenv.mkDerivation (rec { homepage = "https://savannah.gnu.org/projects/readline/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; branch = "6.2"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 2b0cf978d43..2f63c4a3043 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses }: +{ fetchurl, lib, stdenv, ncurses }: stdenv.mkDerivation { name = "readline-6.3p08"; @@ -14,14 +14,14 @@ stdenv.mkDerivation { patchFlags = [ "-p0" ]; - configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) # This test requires running host code "bash_cv_wcwidth_broken=no"; patches = [ ./link-against-ncurses.patch ./no-arch_only-6.3.patch - ] ++ stdenv.lib.optional stdenv.hostPlatform.useAndroidPrebuilt ./android.patch + ] ++ lib.optional stdenv.hostPlatform.useAndroidPrebuilt ./android.patch ++ (let patch = nr: sha256: @@ -32,7 +32,7 @@ stdenv.mkDerivation { in import ./readline-6.3-patches.nix patch); - meta = with stdenv.lib; { + meta = with lib; { description = "Library for interactive line editing"; longDescription = '' diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix index 248ef55cce8..25ef4b97a86 100644 --- a/pkgs/development/libraries/readline/7.0.nix +++ b/pkgs/development/libraries/readline/7.0.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses +{ fetchurl, lib, stdenv, ncurses }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ] ++ upstreamPatches; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for interactive line editing"; longDescription = '' diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix index 6e1182647c2..9ea0277467e 100644 --- a/pkgs/development/libraries/readline/8.0.nix +++ b/pkgs/development/libraries/readline/8.0.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses +{ fetchurl, lib, stdenv, ncurses }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ] ++ upstreamPatches; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for interactive line editing"; longDescription = '' diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index 6aed49d65e3..760546fc471 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, expat, zlib, geos, libspatialite }: +{ lib, stdenv, fetchurl, expat, zlib, geos, libspatialite }: stdenv.mkDerivation rec { name = "readosm-1.1.0a"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source library to extract valid data from within an Open Street Map input file"; homepage = "https://www.gaia-gis.it/fossil/readosm"; - license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; - platforms = stdenv.lib.platforms.linux; + license = with lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/redkite/default.nix b/pkgs/development/libraries/redkite/default.nix index ce3ac37895e..bc82e95be71 100644 --- a/pkgs/development/libraries/redkite/default.nix +++ b/pkgs/development/libraries/redkite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, cairo }: +{ lib, stdenv, fetchFromGitHub, cmake, cairo }: stdenv.mkDerivation rec { pname = "redkite"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.com/iurie-sw/redkite"; description = "A small GUI toolkit"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index ab35139ce71..618c91421b6 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkg-config, autoreconfHook, librep, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, librep, gtk2 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "rep-gtk"; diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index 74f4d693569..5b73bc41475 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkg-config }: +{ lib, stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { name = "resolv_wrapper-1.1.6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix index cbc564fe230..88a96209993 100644 --- a/pkgs/development/libraries/rlog/default.nix +++ b/pkgs/development/libraries/rlog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "rlog-1.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.arg0.net/rlog"; description = "A C++ logging library used in encfs"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl3; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl3; }; } diff --git a/pkgs/development/libraries/rlottie/default.nix b/pkgs/development/libraries/rlottie/default.nix index 3713bcf1df7..a8cd88cae50 100644 --- a/pkgs/development/libraries/rlottie/default.nix +++ b/pkgs/development/libraries/rlottie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config }: stdenv.mkDerivation rec { pname = "rlottie"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Samsung/rlottie"; description = "A platform independent standalone c++ library for rendering vector based animations and art in realtime"; license = licenses.unfree; # Mixed, see https://github.com/Samsung/rlottie/blob/master/COPYING diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index c359c753388..e68f74e2896 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, SDL2, fetchFromGitHub, cmake }: +{ lib, stdenv, SDL2, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "rnnoise-plugin"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A real-time noise suppression plugin for voice based on Xiph's RNNoise"; homepage = "https://github.com/werman/noise-suppression-for-voice"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/development/libraries/robin-map/default.nix index 9c0774f925b..a0a068dc142 100644 --- a/pkgs/development/libraries/robin-map/default.nix +++ b/pkgs/development/libraries/robin-map/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Tessil/robin-map"; description = "C++ implementation of a fast hash map and hash set using robin hood hashing"; license = licenses.mit; diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 5e6ce5d6797..9337680f55c 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , rocm-cmake @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { --replace "/build/source/build" "$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Radeon Open Compute common language runtime"; homepage = "https://github.com/ROCm-Developer-Tools/ROCclr"; license = licenses.mit; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 12a731385ff..d6f685ff4de 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ bzip2 lz4 snappy zlib zstd ]; - buildInputs = stdenv.lib.optional enableJemalloc jemalloc; + buildInputs = lib.optional enableJemalloc jemalloc; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"; cmakeFlags = [ "-DPORTABLE=1" @@ -47,17 +47,17 @@ stdenv.mkDerivation rec { "-DWITH_GFLAGS=0" "-DUSE_RTTI=1" "-DROCKSDB_INSTALL_ON_WINDOWS=YES" # harmless elsewhere - (stdenv.lib.optional + (lib.optional (stdenv.hostPlatform.isx86 && stdenv.hostPlatform.isLinux) "-DFORCE_SSE42=1") - (stdenv.lib.optional enableLite "-DROCKSDB_LITE=1") + (lib.optional enableLite "-DROCKSDB_LITE=1") "-DFAIL_ON_WARNINGS=${if stdenv.hostPlatform.isMinGW then "NO" else "YES"}" - ] ++ stdenv.lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0"; + ] ++ lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0"; # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" - hardeningDisable = stdenv.lib.optional stdenv.hostPlatform.isWindows "format"; + hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "format"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://rocksdb.org"; description = "A library that provides an embeddable, persistent key-value store for fast storage"; license = licenses.asl20; diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index f8254991013..96f7108e3fe 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, clang, device-libs, lld, llvm }: +{ lib, stdenv, fetchFromGitHub, cmake, clang, device-libs, lld, llvm }: stdenv.mkDerivation rec { pname = "rocm-comgr"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { -i CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "APIs for compiling and inspecting AMDGPU code objects"; homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; license = licenses.ncsa; diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 7c50e375228..965d92179b6 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , clang @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DCLANG=${clang}/bin/clang" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of AMD-specific device-side language runtime libraries"; homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs"; license = licenses.ncsa; diff --git a/pkgs/development/libraries/rocm-opencl-icd/default.nix b/pkgs/development/libraries/rocm-opencl-icd/default.nix index 5f2188f6e7e..903c238f455 100644 --- a/pkgs/development/libraries/rocm-opencl-icd/default.nix +++ b/pkgs/development/libraries/rocm-opencl-icd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rocm-opencl-runtime }: +{ lib, stdenv, rocm-opencl-runtime }: stdenv.mkDerivation rec { pname = "rocm-opencl-icd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { echo "${rocm-opencl-runtime}/lib/libamdocl64.so" > $out/etc/OpenCL/vendors/amdocl64.icd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenCL ICD definition for AMD GPUs using the ROCm stack"; license = licenses.mit; maintainers = with maintainers; [ danieldk ]; diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index ecd9e0f7e82..ab0957474ad 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , addOpenGLRunpath , cmake @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { echo 'add_dependencies(amdocl64 OpenCL)' >> amdocl/CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"; license = with licenses; [ asl20 mit ]; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 15435e7914d..beb0c61e683 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , addOpenGLRunpath , clang-unwrapped @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { rm -rf $out/hsa ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Platform runtime for ROCm"; homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; license = with licenses; [ ncsa ]; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 535f686f23d..5863e1f0a57 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp -r $src/include $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Radeon open compute thunk interface"; homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"; license = with licenses; [ bsd2 mit ]; diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix index 5ae66f676d6..e5fb0462683 100644 --- a/pkgs/development/libraries/rote/default.nix +++ b/pkgs/development/libraries/rote/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "rote"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Our Own Terminal Emulation Library"; longDescription = '' ROTE is a simple C library for VT102 terminal emulation. It allows the diff --git a/pkgs/development/libraries/rttr/default.nix b/pkgs/development/libraries/rttr/default.nix index b4d9204c226..b0f4f2a567a 100644 --- a/pkgs/development/libraries/rttr/default.nix +++ b/pkgs/development/libraries/rttr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ninja }: +{ lib, stdenv, fetchFromGitHub, cmake, ninja }: stdenv.mkDerivation rec { pname = "rttr"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "-DBUILD_PACKAGE=OFF" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ Reflection Library"; homepage = "https://www.rttr.org"; license = licenses.mit; diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index ca608c52543..7fc8fe98db2 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libsamplerate, libsndfile, fftw +{ lib, stdenv, fetchurl, pkg-config, libsamplerate, libsndfile, fftw , vamp-plugin-sdk, ladspaH }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ]; - meta = with stdenv.lib; { + meta = with lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; homepage = "https://breakfastquay.com/rubberband/"; # commercial license available as well, see homepage. You'll get some more optimized routines diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index e4a3e586614..db18621d8e4 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, path, runtimeShell }: +{ lib, stdenv, fetchurl, path, runtimeShell }: stdenv.mkDerivation rec { pname = "safefile"; version = "1.0.5"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "File open routines to safely open a file when in the presence of an attack"; - license = stdenv.lib.licenses.asl20 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://research.cs.wisc.edu/mist/safefile/"; updateWalker = true; }; diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix index 381c58e3f7d..0ff6db17561 100644 --- a/pkgs/development/libraries/sbc/default.nix +++ b/pkgs/development/libraries/sbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libsndfile }: +{ lib, stdenv, fetchurl, pkg-config, libsndfile }: stdenv.mkDerivation rec { name = "sbc-1.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SubBand Codec Library"; homepage = "http://www.bluez.org/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix index 91baa8d03b8..c871f18e69b 100644 --- a/pkgs/development/libraries/sblim-sfcc/default.nix +++ b/pkgs/development/libraries/sblim-sfcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, curl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, curl }: stdenv.mkDerivation rec { pname = "sblim-sfcc"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Small Footprint CIM Client Library"; homepage = "https://sourceforge.net/projects/sblim/"; license = licenses.cpl10; diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 8d16ae10889..7706366dd6d 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, orc, pkg-config, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchurl, orc, pkg-config, fetchpatch, autoreconfHook }: stdenv.mkDerivation { name = "schroedinger-1.0.11"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of the Dirac video codec in ANSI C"; homepage = "https://sourceforge.net/projects/schrodinger/"; maintainers = [ maintainers.spwhitt ]; diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index 00a6e50aa7f..c265f24c182 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://icl.utk.edu/papi/"; description = "PAPI provides the tool designer and application engineer with a consistent interface and methodology for use of the performance counter hardware found in most major microprocessors"; license = licenses.bsdOriginal; diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/development/libraries/science/biology/EBTKS/default.nix index c60fe31aaaf..b75ac06627f 100644 --- a/pkgs/development/libraries/science/biology/EBTKS/default.nix +++ b/pkgs/development/libraries/science/biology/EBTKS/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libminc }: +{ lib, stdenv, fetchFromGitHub, cmake, libminc }: stdenv.mkDerivation rec { pname = "EBTKS"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BIC-MNI/${pname}"; description = "Library for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/science/biology/bicgl/default.nix b/pkgs/development/libraries/science/biology/bicgl/default.nix index 4cc7dcada52..bc2de6e882f 100644 --- a/pkgs/development/libraries/science/biology/bicgl/default.nix +++ b/pkgs/development/libraries/science/biology/bicgl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu }: +{ lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu }: stdenv.mkDerivation rec { pname = "bicgl"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-DBICPL_DIR=${bicpl}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/${owner}/${pname}"; description = "Brain Imaging Centre graphics library"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/pkgs/development/libraries/science/biology/bicpl/default.nix index 96199f0478e..0bdcbf5a828 100644 --- a/pkgs/development/libraries/science/biology/bicpl/default.nix +++ b/pkgs/development/libraries/science/biology/bicpl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libminc, netpbm }: +{ lib, stdenv, fetchFromGitHub, cmake, libminc, netpbm }: stdenv.mkDerivation rec { pname = "bicpl"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; # internal_volume_io.h: No such file or directory - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/${owner}/${pname}"; description = "Brain Imaging Centre programming library"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/science/biology/bpp-core/default.nix b/pkgs/development/libraries/science/biology/bpp-core/default.nix index cfbe19d724b..d1eb096e08e 100644 --- a/pkgs/development/libraries/science/biology/bpp-core/default.nix +++ b/pkgs/development/libraries/science/biology/bpp-core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "bpp-core"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://biopp.univ-montp2.fr/wiki/index.php/Main_Page"; changelog = "https://github.com/BioPP/bpp-core/blob/master/ChangeLog"; description = "C++ bioinformatics libraries and tools"; diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index e55a72fb9f8..55ee5ab4fb6 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3, Cocoa }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3, Cocoa }: stdenv.mkDerivation rec { pname = "elastix"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ itk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ itk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; doCheck = !stdenv.isDarwin; # usual dynamic linker issues @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$(pwd)/bin "; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://elastix.isi.uu.nl/"; description = "Image registration toolkit based on ITK"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/science/biology/gifticlib/default.nix b/pkgs/development/libraries/science/biology/gifticlib/default.nix index dddf29fb019..306324129cb 100644 --- a/pkgs/development/libraries/science/biology/gifticlib/default.nix +++ b/pkgs/development/libraries/science/biology/gifticlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, expat, nifticlib, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, expat, nifticlib, zlib }: stdenv.mkDerivation rec { pname = "gifticlib"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nitrc.org/projects/gifti"; description = "Medical imaging geometry format C API"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 9da6595e7a4..cb3a543ad2a 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }: +{ lib, stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }: stdenv.mkDerivation rec { pname = "htslib"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library for reading/writing high-throughput sequencing data"; license = licenses.mit; homepage = "http://www.htslib.org/"; diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index d010e84f712..0d23489696f 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib, tbb }: +{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib, tbb }: stdenv.mkDerivation rec { version = "2.0.0"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gtest ]; buildInputs = [ boost eigen python vtk zlib tbb ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BioMedIA/MIRTK"; description = "Medical image registration library and tools"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/science/biology/nifticlib/default.nix b/pkgs/development/libraries/science/biology/nifticlib/default.nix index 572c31dd1e5..fee2ea8772b 100644 --- a/pkgs/development/libraries/science/biology/nifticlib/default.nix +++ b/pkgs/development/libraries/science/biology/nifticlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib }: stdenv.mkDerivation rec { pname = "nifticlib"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://nifti-imaging.github.io"; description = "Medical imaging format C API"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/science/biology/oobicpl/default.nix b/pkgs/development/libraries/science/biology/oobicpl/default.nix index e5ecda0390b..626e6475ba1 100644 --- a/pkgs/development/libraries/science/biology/oobicpl/default.nix +++ b/pkgs/development/libraries/science/biology/oobicpl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libminc, bicpl, arguments, pcre-cpp }: +{ lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, arguments, pcre-cpp }: stdenv.mkDerivation rec { pname = "oobicpl"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-DARGUMENTS_DIR=${arguments}/lib" "-DOOBICPL_BUILD_SHARED_LIBS=TRUE" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/${owner}/${pname}"; description = "Brain Imaging Centre object-oriented programming library (and tools)"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix index b5fa5c8825e..254ce08dc60 100644 --- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix +++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "QuadProgpp"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/liuq/QuadProgpp"; license = licenses.mit; description = '' diff --git a/pkgs/development/libraries/science/math/amd-blis/default.nix b/pkgs/development/libraries/science/math/amd-blis/default.nix index 9bddba0261f..42c84b3ed61 100644 --- a/pkgs/development/libraries/science/math/amd-blis/default.nix +++ b/pkgs/development/libraries/science/math/amd-blis/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , perl , python3 @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--enable-cblas" "--blas-int-size=${blasIntSize}" - ] ++ stdenv.lib.optionals withOpenMP [ "--enable-threading=openmp" ] + ] ++ lib.optionals withOpenMP [ "--enable-threading=openmp" ] ++ [ withArchitecture ]; postPatch = '' @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "BLAS-compatible library optimized for AMD CPUs"; homepage = "https://developer.amd.com/amd-aocl/blas-library/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/development/libraries/science/math/amd-libflame/default.nix index 1e331bca695..ac35385f983 100644 --- a/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ln -s $out/lib/libflame.so.${version} $out/lib/liblapacke.so.3 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "LAPACK-compatible linear algebra library optimized for AMD CPUs"; homepage = "https://developer.amd.com/amd-aocl/blas-library/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 0b927bb3eac..382f868a99a 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , gfortran, blas, lapack, eigen }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DINTERFACE64=${stdenv.lib.optionalString blas.isILP64 "1"}" + "-DINTERFACE64=${lib.optionalString blas.isILP64 "1"}" ]; preCheck = if stdenv.isDarwin then '' @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { A collection of Fortran77 subroutines to solve large scale eigenvalue problems. ''; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.ttuegel ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 8408763b4fe..332806c495c 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran }: +{ lib, stdenv, fetchurl, gfortran }: stdenv.mkDerivation rec { pname = "blas"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { installPhase = # FreeBSD's stdenv doesn't use Coreutils. let dashD = if stdenv.isFreeBSD then "" else "-D"; in - (stdenv.lib.optionalString stdenv.isFreeBSD "mkdir -p $out/lib ;") + (lib.optionalString stdenv.isFreeBSD "mkdir -p $out/lib ;") + '' install ${dashD} -m755 libblas.a "$out/lib/libblas.a" install ${dashD} -m755 libblas.so.${version} "$out/lib/libblas.so.${version}" @@ -55,7 +55,7 @@ Libs: -L$out/lib -lblas EOF ''; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.isDarwin '' for fn in $(find $out/lib -name "*.so*"); do if [ -L "$fn" ]; then continue; fi install_name_tool -id "$fn" "$fn" @@ -64,8 +64,8 @@ EOF meta = { description = "Basic Linear Algebra Subprograms"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; homepage = "http://www.netlib.org/blas/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/blis/default.nix b/pkgs/development/libraries/science/math/blis/default.nix index 3943c4dbbca..eb91e0a3d22 100644 --- a/pkgs/development/libraries/science/math/blis/default.nix +++ b/pkgs/development/libraries/science/math/blis/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , perl , python3 @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--enable-cblas" "--blas-int-size=${blasIntSize}" - ] ++ stdenv.lib.optionals withOpenMP [ "--enable-threading=openmp" ] + ] ++ lib.optionals withOpenMP [ "--enable-threading=openmp" ] ++ [ withArchitecture ]; postPatch = '' @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "BLAS-compatible linear algebra library"; homepage = "https://github.com/flame/blis"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix index 0d8e3415e20..870568c9ac9 100644 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkg-config @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/BRiAl/BRiAl"; description = "Legacy version of PolyBoRi maintained by sagemath developers"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index 6b37abf9c69..56c2b70eeac 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -136,8 +136,8 @@ stdenv.mkDerivation rec { algorithms. You can bring your creations to scale using the power of GPUs in the cloud or to the masses on mobile with Caffe2's cross-platform libraries. ''; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; + platforms = with lib.platforms; linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ yuriaisaka ]; }; } diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/development/libraries/science/math/cholmod-extra/default.nix index c381f56277e..38d1b126ea4 100644 --- a/pkgs/development/libraries/science/math/cholmod-extra/default.nix +++ b/pkgs/development/libraries/science/math/cholmod-extra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gfortran, suitesparse, blas, lapack }: +{ lib, stdenv, fetchFromGitHub, gfortran, suitesparse, blas, lapack }: stdenv.mkDerivation rec { pname = "cholmod-extra"; version = "1.2.0"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jluttine/cholmod-extra"; description = "A set of additional routines for SuiteSparse CHOLMOD Module"; license = with licenses; [ gpl2Plus ]; diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index a22cf914cf6..aca395001f9 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , gfortran @@ -41,19 +41,19 @@ stdenv.mkDerivation rec { blas python boost - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ ocl-icd opencl-headers - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ OpenCL ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/clMathLibraries/clBLAS"; description = "A software library containing BLAS functions written in OpenCL"; longDescription = '' diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix index 7fe80c323f6..0d8bafffb44 100644 --- a/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://users.aalto.fi/~pat/cliquer.html"; downloadPage = src.meta.homepage; # autocliquer description = "Routines for clique searching"; diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/pkgs/development/libraries/science/math/clmagma/default.nix index 2e798a6b83e..60a3afb5077 100644 --- a/pkgs/development/libraries/science/math/clmagma/default.nix +++ b/pkgs/development/libraries/science/math/clmagma/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }: +{ lib, stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }: -with stdenv.lib; +with lib; let version = "1.3.0"; @@ -65,7 +65,7 @@ in stdenv.mkDerivation { cp ${incfile} make.inc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Matrix Algebra on GPU and Multicore Architectures, OpenCL port"; license = licenses.bsd3; homepage = "http://icl.cs.utk.edu/magma/index.html"; diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index e727218c055..59c0b7f4498 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { majorVersion = lib.versions.major version; }; - meta = with stdenv.lib; { + meta = with lib; { description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; homepage = "https://developer.nvidia.com/cudnn"; license = licenses.unfree; diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/development/libraries/science/math/ecos/default.nix index 2ba69a34a4a..b60bd1fe76c 100644 --- a/pkgs/development/libraries/science/math/ecos/default.nix +++ b/pkgs/development/libraries/science/math/ecos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ecos"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cp -r include $out/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight conic solver for second-order cone programming"; homepage = "https://www.embotech.com/ECOS"; downloadPage = "https://github.com/embotech/ecos/releases"; diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix index 3f88d4de026..e80607ab955 100644 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , boost @@ -50,8 +50,8 @@ let meta = { description = "Distributed just-in-time shared library building"; homepage = "https://fenicsproject.org/"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.lgpl3; + platforms = lib.platforms.all; + license = lib.licenses.lgpl3; }; }; @@ -80,8 +80,8 @@ let meta = { description = "Automatic generation of finite element basis functions"; homepage = "https://fenicsproject.org/"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.lgpl3; + platforms = lib.platforms.all; + license = lib.licenses.lgpl3; }; }; @@ -102,8 +102,8 @@ let meta = { description = "A domain-specific language for finite element variational forms"; homepage = "https://fenicsproject.org/"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.lgpl3; + platforms = lib.platforms.all; + license = lib.licenses.lgpl3; }; }; @@ -139,8 +139,8 @@ let meta = { description = "A compiler for finite element variational forms"; homepage = "https://fenicsproject.org/"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.lgpl3; + platforms = lib.platforms.all; + license = lib.licenses.lgpl3; }; }; dolfin = stdenv.mkDerivation { @@ -215,7 +215,7 @@ let meta = { description = "The FEniCS Problem Solving Environment in Python and C++"; homepage = "https://fenicsproject.org/"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; }; }; python-dolfin = pythonPackages.buildPythonPackage rec { @@ -254,8 +254,8 @@ let meta = { description = "Python bindings for the DOLFIN FEM compiler"; homepage = "https://fenicsproject.org/"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.lgpl3; + platforms = lib.platforms.all; + license = lib.licenses.lgpl3; }; }; in python-dolfin diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/development/libraries/science/math/flintqs/default.nix index 32fb70978cf..c956eae4f71 100644 --- a/pkgs/development/libraries/science/math/flintqs/default.nix +++ b/pkgs/development/libraries/science/math/flintqs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , gmp @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sagemath/FlintQS"; description = "Highly optimized multi-polynomial quadratic sieve for integer factorization"; license = with licenses; [ gpl2 ]; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 97374fb0d47..d1d7a9b9f34 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, blas, lapack, gfortran }: +{ lib, stdenv, fetchurl, unzip, blas, lapack, gfortran }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A software package for large-scale nonlinear optimization"; homepage = "https://projects.coin-or.org/Ipopt"; license = licenses.epl10; diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix index 90e0a84e1e2..81303a3653e 100644 --- a/pkgs/development/libraries/science/math/itpp/default.nix +++ b/pkgs/development/libraries/science/math/itpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , gtest @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ./gtests/itpp_gtests ''; - meta = with stdenv.lib; { + meta = with lib; { description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions"; homepage = http://itpp.sourceforge.net/; license = licenses.gpl3; diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index 6f80e1fd23e..95034c3637a 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , pari @@ -68,13 +68,13 @@ stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/lcalc-c++11.patch?h=packages/lcalc&id=3607b97df5a8c231191115b0cb5c62426b339e71"; sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3"; }) - ] ++ stdenv.lib.optional stdenv.isDarwin + ] ++ lib.optional stdenv.isDarwin (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/clang.patch"; sha256 = "0bb7656z6cp6i4p2qj745cmq0lhh52v2akl9whi760dynfdxbl18"; }); - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/Makefile --replace g++ c++ ''; @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { "PARI_PREFIX=${pari}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html"; description = "A program for calculating with L-functions"; license = with licenses; [ gpl2 ]; diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix index 36d4ad54c3d..cc5d3baf344 100644 --- a/pkgs/development/libraries/science/math/libbraiding/default.nix +++ b/pkgs/development/libraries/science/math/libbraiding/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # no tests included for now (2018-08-05), but can't hurt to activate doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/miguelmarco/libbraiding/"; description = "C++ library for computations on braid groups"; longDescription = '' diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix index 788f534cc77..b756109aa8f 100644 --- a/pkgs/development/libraries/science/math/libhomfly/default.nix +++ b/pkgs/development/libraries/science/math/libhomfly/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , boehmgc @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/miguelmarco/libhomfly/"; description = "Library to compute the homfly polynomial of knots and links"; license = licenses.unlicense; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index c44e995bfbb..c742cc60b27 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -1,5 +1,5 @@ { - stdenv, + lib, stdenv, fetchFromGitHub, gfortran, cmake, @@ -7,7 +7,7 @@ shared ? true }: let - inherit (stdenv.lib) optional; + inherit (lib) optional; version = "3.9.0"; in @@ -33,7 +33,7 @@ stdenv.mkDerivation { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix index 49108e5e330..20c5a2070a0 100644 --- a/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "liblbfgs-1.10"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { description = "Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)"; homepage = "http://www.chokkan.org/software/liblbfgs/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index fba8bcb9367..9631f3931ca 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation { nativeBuildInputs = if stdenv.isDarwin then [ fixDarwinDylibNames ] else [ addOpenGLRunpath patchelf ] - ++ stdenv.lib.optionals cudaSupport [ addOpenGLRunpath ]; + ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; buildInputs = [ stdenv.cc.cc @@ -57,9 +57,9 @@ in stdenv.mkDerivation { postFixup = let libPaths = [ stdenv.cc.cc.lib ] - ++ stdenv.lib.optionals cudaSupport [ nvidia_x11 ]; - rpath = stdenv.lib.makeLibraryPath libPaths; - in stdenv.lib.optionalString stdenv.isLinux '' + ++ lib.optionals cudaSupport [ nvidia_x11 ]; + rpath = lib.makeLibraryPath libPaths; + in lib.optionalString stdenv.isLinux '' find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do echo "setting rpath for $lib..." patchelf --set-rpath "${rpath}:$out/lib" "$lib" @@ -67,7 +67,7 @@ in stdenv.mkDerivation { addOpenGLRunpath "$lib" ''} done - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' install_name_tool -change @rpath/libshm.dylib $out/lib/libshm.dylib $out/lib/libtorch_python.dylib install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_python.dylib install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_python.dylib @@ -110,7 +110,7 @@ in stdenv.mkDerivation { passthru.tests.cmake = callPackage ./test { }; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ API of the PyTorch machine learning framework"; homepage = "https://pytorch.org/"; license = licenses.unfree; # Includes CUDA and Intel MKL. diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix index b0cfbca5aa3..f7f981e223b 100644 --- a/pkgs/development/libraries/science/math/lrs/default.nix +++ b/pkgs/development/libraries/science/math/lrs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gmp}: +{lib, stdenv, fetchurl, gmp}: stdenv.mkDerivation rec { pname = "lrs"; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Implementation of the reverse search algorithm for vertex enumeration/convex hull problems"; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://cgm.cs.mcgill.ca/~avis/C/lrs.html"; }; } diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix index f50c15abbdf..26e26e4ffdb 100644 --- a/pkgs/development/libraries/science/math/m4ri/default.nix +++ b/pkgs/development/libraries/science/math/m4ri/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromBitbucket , autoreconfHook }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://malb.bitbucket.io/m4ri/"; description = "Library to do fast arithmetic with dense matrices over F_2"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix index 532285991a3..38a633e58c7 100644 --- a/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/pkgs/development/libraries/science/math/m4rie/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromBitbucket , autoreconfHook , m4ri @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://malb.bitbucket.io/m4rie/"; description = "Library for matrix multiplication, reduction and inversion over GF(2^k) for 2 <= k <= 10"; longDescription = '' diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index b4ac119ce6c..b8e3999ffe8 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, cmake, gfortran, ninja, cudatoolkit, libpthreadstubs, lapack, blas }: +{ lib, stdenv, fetchurl, cmake, gfortran, ninja, cudatoolkit, libpthreadstubs, lapack, blas }: -with stdenv.lib; +with lib; let version = "2.5.4"; @@ -43,7 +43,7 @@ in stdenv.mkDerivation { > $out/lib/pkgconfig/magma.pc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Matrix Algebra on GPU and Multicore Architectures"; license = licenses.bsd3; homepage = "http://icl.cs.utk.edu/magma/index.html"; diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix index d5861d9db33..b06b432372a 100644 --- a/pkgs/development/libraries/science/math/metis/default.nix +++ b/pkgs/development/libraries/science/math/metis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, cmake }: +{ lib, stdenv, fetchurl, unzip, cmake }: stdenv.mkDerivation { name = "metis-5.1.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "Serial graph partitioning and fill-reducing matrix ordering"; homepage = "http://glaros.dtc.umn.edu/gkhome/metis/metis/overview"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.asl20; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/science/math/mongoose/default.nix b/pkgs/development/libraries/science/math/mongoose/default.nix index 36c53b2994f..7dd52f3b663 100644 --- a/pkgs/development/libraries/science/math/mongoose/default.nix +++ b/pkgs/development/libraries/science/math/mongoose/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Graph Coarsening and Partitioning Library"; homepage = "https://github.com/ScottKolo/Mongoose"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index eb194c0e9e4..5036ad89079 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, cudatoolkit, addOpenGLRunpath }: +{ lib, stdenv, fetchFromGitHub, which, cudatoolkit, addOpenGLRunpath }: stdenv.mkDerivation rec { name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; homepage = "https://developer.nvidia.com/nccl"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 0d83c5c3650..bd7b739bd77 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, which +{ lib, stdenv, fetchFromGitHub, perl, which # Most packages depending on openblas expect integer width to match # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). @@ -19,7 +19,7 @@ , enableShared ? !stdenv.hostPlatform.isStatic }: -with stdenv.lib; +with lib; let blas64_ = blas64; in @@ -160,7 +160,7 @@ stdenv.mkDerivation rec { NO_BINARY_MODE = if stdenv.isx86_64 then toString (stdenv.hostPlatform != stdenv.buildPlatform) else stdenv.hostPlatform != stdenv.buildPlatform; - } // (stdenv.lib.optionalAttrs singleThreaded { + } // (lib.optionalAttrs singleThreaded { # As described on https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded USE_THREAD = false; USE_LOCKING = true; # available with openblas >= 0.3.7 @@ -188,14 +188,14 @@ EOF ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt} ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt} ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt} - '' + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}.3 ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}.3 ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}.3 ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}.3 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Basic Linear Algebra Subprograms"; license = licenses.bsd3; homepage = "https://github.com/xianyi/OpenBLAS"; diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index 17197823d6e..2c4198d9679 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "openlibm"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { meta = { description = "High quality system independent, portable, open source libm implementation"; homepage = "https://openlibm.org/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ttuegel ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix index 3689df60707..a341264d989 100644 --- a/pkgs/development/libraries/science/math/openspecfun/default.nix +++ b/pkgs/development/libraries/science/math/openspecfun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran }: +{ lib, stdenv, fetchurl, gfortran }: stdenv.mkDerivation { name = "openspecfun-0.5.3"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { meta = { description = "A collection of special mathematical functions"; homepage = "https://github.com/JuliaLang/openspecfun"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ttuegel ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 0dc77c10c5e..53c117233d2 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which +{ lib, stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which , lsb-release, glog, protobuf, cbc, zlib , ensureNewerSourcesForZipFilesHook, python, swig }: @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "python" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/google/or-tools"; license = licenses.asl20; description = '' diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index aa340b6dafa..b61cd840606 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { passthru = { inherit withGurobi withCplex; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An abstract base class to a generic linear programming (LP) solver"; homepage = "https://github.com/coin-or/Osi"; license = licenses.epl10; diff --git a/pkgs/development/libraries/science/math/osqp/default.nix b/pkgs/development/libraries/science/math/osqp/default.nix index 9cd062d21f2..00f2726f60f 100644 --- a/pkgs/development/libraries/science/math/osqp/default.nix +++ b/pkgs/development/libraries/science/math/osqp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A quadratic programming solver using operator splitting"; homepage = "https://osqp.org"; license = licenses.asl20; diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix index 050e8f1b285..db70bf8dd7a 100644 --- a/pkgs/development/libraries/science/math/parmetis/default.nix +++ b/pkgs/development/libraries/science/math/parmetis/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , cmake , mpi @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { make config metis_path=$PWD/metis gklib_path=$PWD/metis/GKlib prefix=$out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices"; homepage = "http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview"; platforms = platforms.all; diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index a1e9d1e3051..f06a028fe64 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -1,4 +1,4 @@ -{ stdenv , darwin , fetchurl , blas , gfortran , lapack , python }: +{ lib, stdenv , darwin , fetchurl , blas , gfortran , lapack , python }: stdenv.mkDerivation rec { pname = "petsc"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace configure \ --replace /bin/sh /usr/bin/python - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace config/install.py \ --replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool ''; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ) ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' Library of linear algebra algorithms for solving partial differential equations diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix index b1d6a072e13..a257b84ca54 100644 --- a/pkgs/development/libraries/science/math/planarity/default.nix +++ b/pkgs/development/libraries/science/math/planarity/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , autoreconfHook @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/graph-algorithms/edge-addition-planarity-suite"; description = "A library for implementing graph algorithms"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix index 46709ff218a..d99026bc565 100644 --- a/pkgs/development/libraries/science/math/primesieve/default.nix +++ b/pkgs/development/libraries/science/math/primesieve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { pname = "primesieve"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0g60br3p8di92jx3pr2bb51xh15gg57l7qvwzwn7xf7l585hgi7v"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast C/C++ prime number generator"; homepage = "https://primesieve.org/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix index 53f4313a206..38c9444d0d3 100644 --- a/pkgs/development/libraries/science/math/rankwidth/default.nix +++ b/pkgs/development/libraries/science/math/rankwidth/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # check phase is empty for now (as of version 0.7) doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Calculates rank-width and rank-decompositions"; license = with licenses; [ gpl2Plus ]; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix index 44f8150386e..b4b67088498 100644 --- a/pkgs/development/libraries/science/math/rubiks/default.nix +++ b/pkgs/development/libraries/science/math/rubiks/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , coreutils @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.sagemath.org/spkg/rubiks"; description = "Several programs for working with Rubik's cubes"; # The individual websites are no longer available diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index b4d339f6226..4ef10439cc5 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, openssh +{ lib, stdenv, fetchFromGitHub, cmake, openssh , gfortran, mpi, blas, lapack } : @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/lib ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.netlib.org/scalapack/"; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index 3820f2b9527..96f543e430f 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }: +{ lib, stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --replace "gcc" "cc" ''; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ blas lapack gfortran.cc.lib ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Splitting Conic Solver"; longDescription = '' Numerical optimization package for solving large-scale convex cone problems diff --git a/pkgs/development/libraries/science/math/spooles/default.nix b/pkgs/development/libraries/science/math/spooles/default.nix index c55a1b8002e..6f4ddb3f787 100644 --- a/pkgs/development/libraries/science/math/spooles/default.nix +++ b/pkgs/development/libraries/science/math/spooles/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, perl }: +{ lib, stdenv, fetchurl, gfortran, perl }: stdenv.mkDerivation rec { pname = "spooles"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ./spooles.patch ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace makefile --replace '-Wl,-soname' '-Wl,-install_name' ''; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.netlib.org/linalg/spooles/"; description = "Library for solving sparse real and complex linear systems of equations"; license = licenses.publicDomain; diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 1c910a4f75b..7696b18e7ca 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , gnum4 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { gnum4 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Graph algorithms in the language of linear algebra"; homepage = "http://faculty.cse.tamu.edu/davis/GraphBLAS.html"; license = licenses.asl20; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix index b1c1202c578..b8ce3eca888 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, blas, lapack }: +{ lib, stdenv, fetchurl, gfortran, blas, lapack }: let int_t = if blas.isILP64 then "int64_t" else "int32_t"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "LAPACK=-llapack" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html"; description = "A suite of sparse matrix algorithms"; license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix index 81a80c920b5..1ebac6ac445 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, blas, lapack +{ lib, stdenv, fetchurl, gfortran, blas, lapack , enableCuda ? false, cudatoolkit }: @@ -27,11 +27,11 @@ stdenv.mkDerivation { -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \ -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/' '' - + stdenv.lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/' '' - + stdenv.lib.optionalString enableCuda '' + + lib.optionalString enableCuda '' sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ -e 's|^[[:space:]]*\(CUDA_ROOT =\)|CUDA_ROOT = ${cudatoolkit}|' \ -e 's|^[[:space:]]*\(GPU_BLAS_PATH =\)|GPU_BLAS_PATH = $(CUDA_ROOT)|' \ @@ -55,7 +55,7 @@ stdenv.mkDerivation { "LAPACK=-llapack" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin " -DNTIMER"; postInstall = '' # Build and install shared library @@ -64,7 +64,7 @@ stdenv.mkDerivation { for i in "$out"/lib/lib*.a; do ar -x $i done - ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lblas ${stdenv.lib.optionalString enableCuda "-lcublas"} + ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lblas ${lib.optionalString enableCuda "-lcublas"} ) for i in umfpack cholmod amd camd colamd spqr; do ln -s libsuitesparse${SHLIB_EXT} "$out"/lib/lib$i${SHLIB_EXT} @@ -90,7 +90,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ gfortran ]; buildInputs = [ blas lapack ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html"; description = "A suite of sparse matrix algorithms"; license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 2e76050aa98..f0c82e7190f 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , gfortran , blas, lapack @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; # Use compatible indexing for lapack and blas used buildInputs = assert (blas.isILP64 == lapack.isILP64); [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { gfortran.cc.lib gmp mpfr - ] ++ stdenv.lib.optional enableCuda cudatoolkit; + ] ++ lib.optional enableCuda cudatoolkit; preConfigure = '' # Mongoose and GraphBLAS are packaged separately @@ -45,13 +45,13 @@ stdenv.mkDerivation rec { "INSTALL_INCLUDE=${placeholder "dev"}/include" "JOBS=$(NIX_BUILD_CORES)" "MY_METIS_LIB=-lmetis" - ] ++ stdenv.lib.optionals blas.isILP64 [ + ] ++ lib.optionals blas.isILP64 [ "CFLAGS=-DBLAS64" - ] ++ stdenv.lib.optionals enableCuda [ + ] ++ lib.optionals enableCuda [ "CUDA_PATH=${cudatoolkit}" "CUDART_LIB=${cudatoolkit.lib}/lib/libcudart.so" "CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ # Unless these are set, the build will attempt to use `Accelerate` on darwin, see: # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.8.1/SuiteSparse_config/SuiteSparse_config.mk#L368 "BLAS=-lblas" @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { "library" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html"; description = "A suite of sparse matrix algorithms"; license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index 892ccb4da11..26dd00d9606 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, +{ lib, stdenv, fetchurl, cmake, gfortran, blas, lapack}: assert (!blas.isILP64) && (!lapack.isILP64); @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/"; license = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/License.txt"; description = "A library for the solution of large, sparse, nonsymmetric systems of linear equations"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index a83e2c83546..3c31ed8a361 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , makeWrapper , which @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { "$out/bin/sympow" -sp 2p16 -curve "[1,2,3,4,5]" | grep '8.3705' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Compute special values of symmetric power elliptic curve L-functions"; license = { shortName = "sympow"; diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/pkgs/development/libraries/science/math/tensorflow/bin.nix index 3f3e1871f43..d42026c13cf 100644 --- a/pkgs/development/libraries/science/math/tensorflow/bin.nix +++ b/pkgs/development/libraries/science/math/tensorflow/bin.nix @@ -1,10 +1,10 @@ -{ stdenv +{ lib, stdenv , fetchurl , addOpenGLRunpath , cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11 }: -with stdenv.lib; +with lib; let broken = !stdenv.isLinux && !stdenv.isDarwin; diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix index 494c7f9f851..4a90f082dc0 100644 --- a/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -33,8 +33,8 @@ let pythonEnv = python.withPackages(ps: - stdenv.lib.optional withManual ps.sphinx - ++ stdenv.lib.optionals pythonSupport (with ps;[ pybindgen pygccxml ]) + lib.optional withManual ps.sphinx + ++ lib.optionals pythonSupport (with ps;[ pybindgen pygccxml ]) ); in stdenv.mkDerivation rec { @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { patchShebangs doc/ns3_html_theme/get_version.sh ''; - wafConfigureFlags = with stdenv.lib; [ + wafConfigureFlags = with lib; [ "--enable-modules=${concatStringsSep "," modules}" "--with-python=${pythonEnv.interpreter}" ] @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { # to prevent fatal error: 'backward_warning.h' file not found CXXFLAGS = "-D_GLIBCXX_PERMIT_BACKWARD_HASH"; - postBuild = with stdenv.lib; let flags = concatStringsSep ";" ( + postBuild = with lib; let flags = concatStringsSep ";" ( optional enableDoxygen "./waf doxygen" ++ optional withManual "./waf sphinx" ); @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { # strictoverflow prevents clang from discovering pyembed when bindings hardeningDisable = [ "fortify" "strictoverflow"]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.nsnam.org"; license = licenses.gpl3; description = "A discrete time event network simulator"; diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/pkgs/development/libraries/science/robotics/ispike/default.nix index 70488426b01..b3eed2e326e 100644 --- a/pkgs/development/libraries/science/robotics/ispike/default.nix +++ b/pkgs/development/libraries/science/robotics/ispike/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost }: +{ lib, stdenv, fetchurl, cmake, boost }: stdenv.mkDerivation rec { pname = "ispike"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { description = "Spiking neural interface between iCub and a spiking neural simulator"; homepage = "https://sourceforge.net/projects/ispike/"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index 0d980d9d1a2..0fcb4884de5 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, patchelf, libusb-compat-0_1}: +{lib, stdenv, fetchurl, patchelf, libusb-compat-0_1}: assert stdenv ? cc && stdenv.cc.libc != null; @@ -33,8 +33,8 @@ stdenv.mkDerivation { meta = { homepage = "http://www.scmmicro.com/support/pc-security-support/downloads.html"; description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/development/libraries/scriptaculous/default.nix index f4e5ae37892..c2beda45ab3 100644 --- a/pkgs/development/libraries/scriptaculous/default.nix +++ b/pkgs/development/libraries/scriptaculous/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec { pname = "scriptaculous"; version = "1.9.0"; @@ -14,7 +14,7 @@ cp src/*.js $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of JavaScript libraries to enhance the user interface of web sites"; longDescription = '' script.aculo.us provides you with diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/development/libraries/seasocks/default.nix index 241046b09fe..8c5b4e87d9b 100644 --- a/pkgs/development/libraries/seasocks/default.nix +++ b/pkgs/development/libraries/seasocks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, python, zlib }: stdenv.mkDerivation rec { pname = "seasocks"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib python ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mattgodbolt/seasocks"; description = "Tiny embeddable C++ HTTP and WebSocket server"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index da1749e4785..8ab0f8ef69a 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/google/sentencepiece"; description = "Unsupervised text tokenizer for Neural Network-based text generation"; license = licenses.asl20; diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index bf8c596a795..641a5120e8d 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, python3, wafHook }: +{ lib, stdenv, fetchurl, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "serd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 wafHook ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://drobilla.net/software/serd"; description = "A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; license = licenses.mit; diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index c83ecaca7c0..dbdc9ce2871 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos +{ lib, stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos , pkg-config, libiconv }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; buildInputs = [ apr openssl aprutil zlib libiconv ] - ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos; + ++ lib.optional (!stdenv.isCygwin) kerberos; patches = [ ./scons.patch ]; @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { sconsFlags+=" CC=$CC" sconsFlags+=" OPENSSL=${openssl}" sconsFlags+=" ZLIB=${zlib}" - '' + stdenv.lib.optionalString (!stdenv.isCygwin) '' + '' + lib.optionalString (!stdenv.isCygwin) '' sconsFlags+=" GSSAPI=${kerberos.dev}" ''; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "HTTP client library based on APR"; license = licenses.asl20; maintainers = with maintainers; [ orivej raskin ]; diff --git a/pkgs/development/libraries/serialdv/default.nix b/pkgs/development/libraries/serialdv/default.nix index 47d4e68f658..d1d9c6299b3 100644 --- a/pkgs/development/libraries/serialdv/default.nix +++ b/pkgs/development/libraries/serialdv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "serialdv"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++ Minimal interface to encode and decode audio with AMBE3000 based devices in packet mode over a serial link"; homepage = "https://github.com/f4exb/serialdv"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 7b5e1dcdb2b..c9a326afa7f 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis +{ lib, stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis , glew, libXrandr, libXrender, udev, xcbutilimage , IOKit, Foundation, AppKit, OpenAL }: @@ -18,16 +18,16 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ freetype libjpeg openal flac libvorbis glew ] - ++ stdenv.lib.optional stdenv.isLinux udev - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] - ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; + ++ lib.optional stdenv.isLinux udev + ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] + ++ lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" "-DSFML_MISC_INSTALL_PREFIX=share/SFML" "-DSFML_BUILD_FRAMEWORKS=no" "-DSFML_USE_SYSTEM_DEPS=yes" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.sfml-dev.org/"; description = "Simple and fast multimedia library"; longDescription = '' diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix index 40009a8b7c3..7c3fbb9f39e 100644 --- a/pkgs/development/libraries/sfsexp/default.nix +++ b/pkgs/development/libraries/sfsexp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "sfsexp"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "18gdwxjja0ip378hlzs8sp7q2g6hrmy7x10yf2wnxfmmylbpqn8k"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Small, fast s-expression library"; homepage = "http://sexpr.sourceforge.net/"; maintainers = with maintainers; [ jb55 ]; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index 8fd4987ac70..abb27a132c2 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "shapelib-1.5.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1qfsgb8b3yiqwvr6h9m81g6k9fjhfys70c22p7kzkbick20a9h0z"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "C Library for reading, writing and updating ESRI Shapefiles"; homepage = "http://shapelib.maptools.org/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/development/libraries/shhmsg/default.nix index 04b764afc94..0c736e4cb91 100644 --- a/pkgs/development/libraries/shhmsg/default.nix +++ b/pkgs/development/libraries/shhmsg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "shhmsg-1.4.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTBASEDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for displaying messages"; homepage = "https://shh.thathost.com/pub-unix/"; license = licenses.artistic1; diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/development/libraries/shhopt/default.nix index 45ec31ca4df..da1b820fcd5 100644 --- a/pkgs/development/libraries/shhopt/default.nix +++ b/pkgs/development/libraries/shhopt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "shhopt-1.1.7"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTBASEDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for parsing command line options"; homepage = "https://shh.thathost.com/pub-unix/"; license = licenses.artistic1; diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index d6065c925e8..f3b80c0b548 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkg-config, xercesc, xml-security-c, xml-tooling-c }: +{ lib, stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkg-config, xercesc, xml-security-c, xml-tooling-c }: stdenv.mkDerivation rec { pname = "shibboleth-sp"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://shibboleth.net/products/service-provider.html"; description = "Enables SSO and Federation web applications written with any programming language or framework"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix index 77090a19ba3..06cf7587616 100644 --- a/pkgs/development/libraries/silgraphite/default.nix +++ b/pkgs/development/libraries/silgraphite/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "An advanced font engine"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 60c454bc145..166d0f2911d 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, freetype, cmake, python }: +{ lib, stdenv, fetchurl, pkg-config, freetype, cmake, python }: stdenv.mkDerivation rec { version = "1.3.14"; @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ freetype ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./macosx.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; checkInputs = [ python ]; doCheck = false; # fails, probably missing something - meta = with stdenv.lib; { + meta = with lib; { description = "An advanced font engine"; maintainers = [ maintainers.raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 63ad97cbe2b..3a7734b1d51 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "simdjson"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "-DSIMDJSON_JUST_LIBRARY=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://simdjson.org/"; description = "Parsing gigabytes of JSON per second"; license = licenses.asl20; diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index da25305fc42..2f1006404b7 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi +{ lib, stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi , libICE, libSM, libXt, libXmu, libGLU, libGL, boost, zlib, libjpeg, freealut , openscenegraph, openal, expat, cmake, apr , curl @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { libICE libSM libXt libXmu libGLU libGL boost zlib libjpeg freealut openscenegraph openal expat apr curl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simulation construction toolkit"; homepage = "https://gitorious.org/fg/simgear"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index e6b013aa137..2ae8b28b64f 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, swig, lua, itk }: +{ lib, stdenv, fetchFromGitHub, cmake, swig, lua, itk }: stdenv.mkDerivation rec { pname = "simpleitk"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # 2.0.0: linker error building examples cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.simpleitk.org"; description = "Simplified interface to ITK"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index 010590b0fcd..a3db5ce0d3b 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , libiconv , libpng , ncurses @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pcre readline zlib - ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ]; + ] ++ lib.optionals (stdenv.isDarwin) [ libiconv ]; propagatedBuildInputs = [ ncurses ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { sed '/^Libs:/s/$/ -lncurses/' -i "$dev"/lib/pkgconfig/slang.pc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A small, embeddable multi-platform programming library"; longDescription = '' S-Lang is an interpreted language that was designed from the start to be diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 401564342b5..47f633f5096 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unzip, scheme, texinfo }: +{ fetchurl, lib, stdenv, unzip, scheme, texinfo }: stdenv.mkDerivation rec { name = "slib-3b5"; @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { ''; # Public domain + permissive (non-copyleft) licensing of some files. - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; homepage = "http://people.csail.mit.edu/jaffer/SLIB"; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/development/libraries/smarty3-i18n/default.nix index d93a59efe6e..7fb6b1adb5a 100644 --- a/pkgs/development/libraries/smarty3-i18n/default.nix +++ b/pkgs/development/libraries/smarty3-i18n/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { pname = "smarty-i18n"; version = "1.0"; @@ -14,7 +14,7 @@ cp block.t.php $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "gettext for the smarty3 framework"; license = licenses.lgpl21; homepage = "https://github.com/kikimosha/smarty3-i18n"; diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix index d5708cb6b1e..2070a3bab79 100644 --- a/pkgs/development/libraries/smarty3/default.nix +++ b/pkgs/development/libraries/smarty3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { pname = "smarty3"; version = "3.1.36"; @@ -14,7 +14,7 @@ cp -r libs/* $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Smarty 3 template engine"; longDescription = '' Smarty is a template engine for PHP, facilitating the diff --git a/pkgs/development/libraries/smesh/default.nix b/pkgs/development/libraries/smesh/default.nix index 1b1f590109f..8494799333b 100644 --- a/pkgs/development/libraries/smesh/default.nix +++ b/pkgs/development/libraries/smesh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, opencascade +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, opencascade , Cocoa }: stdenv.mkDerivation rec { @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ opencascade ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ opencascade ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extension to OCE providing advanced meshing features"; homepage = "https://github.com/tpaviot/smesh"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 335712ac35a..83b4b2193c0 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: +{ lib, stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: stdenv.mkDerivation rec { name = "smpeg-svn${version}"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://icculus.org/smpeg/"; description = "MPEG decoding library"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix index 270e418174e..d57cc91f26e 100644 --- a/pkgs/development/libraries/smpeg2/default.nix +++ b/pkgs/development/libraries/smpeg2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoconf , automake , darwin @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake makeWrapper pkg-config ]; buildInputs = [ SDL2 ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; + ++ lib.optional stdenv.isDarwin darwin.libobjc; preConfigure = '' sh autogen.sh @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://icculus.org/smpeg/"; description = "SDL2 MPEG Player Library"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index e9af9f6d537..4948e481ff5 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -1,6 +1,6 @@ # alsaLib vorbis-tools python can be made optional -{ stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }: +{ lib, stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }: stdenv.mkDerivation { name = "snack-2.2.10"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "The Snack Sound Toolkit (Tcl)"; homepage = "http://www.speech.kth.se/snack/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; broken = true; }; } diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index 0880df7ef2f..ece425e85c4 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , static ? stdenv.hostPlatform.isStatic }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://google.github.io/snappy/"; license = licenses.bsd3; description = "Compression/decompression library for very high speeds"; diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix index 1f9b77cc3c9..f561864a750 100644 --- a/pkgs/development/libraries/soci/default.nix +++ b/pkgs/development/libraries/soci/default.nix @@ -1,7 +1,7 @@ { cmake , fetchFromGitHub , sqlite -, stdenv +, lib, stdenv }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ sqlite ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Database access library for C++"; homepage = "http://soci.sourceforge.net/"; license = licenses.boost; diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index d00af92335d..e1ba9dbc1e6 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkg-config }: +{ lib, stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { name = "socket_wrapper-1.2.5"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A library passing all socket communications through unix sockets"; homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary;"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index 8e38b960480..1395f3e60cf 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, openssl, pkg-config, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, glib, openssl, pkg-config, autoreconfHook }: stdenv.mkDerivation rec { pname = "sofia-sip"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib openssl ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification"; homepage = "https://github.com/freeswitch/sofia-sip"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index fc45e220a51..38dcee84a92 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, fftw, installShellFiles }: stdenv.mkDerivation { pname = "sonic-unstable"; @@ -19,11 +19,11 @@ stdenv.mkDerivation { postInstall = '' installManPage sonic.1 - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' install_name_tool -id $out/lib/libsonic.so.0.3.0 $out/lib/libsonic.so.0.3.0 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple library to speed up or slow down speech"; homepage = "https://github.com/waywardgeek/sonic"; license = licenses.asl20; diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index 861e1d76c1d..c9debd36110 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc +{ lib, stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc , pkg-config }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = "http://soprano.sourceforge.net/"; description = "An object-oriented C++/Qt4 framework for RDF data"; license = "LGPL"; - maintainers = with stdenv.lib.maintainers; [ sander ]; + maintainers = with lib.maintainers; [ sander ]; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index fba7dd80642..2be6c662145 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, coin3d, qtbase, cmake, pkg-config }: +{ fetchFromGitHub, lib, stdenv, coin3d, qtbase, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "soqt"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/coin3d/soqt"; license = licenses.bsd3; description = "Glue between Coin high-level 3D visualization library and Qt"; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 66803a066b5..befe6a34cd1 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, python3, serd, pcre, wafHook }: +{ lib, stdenv, fetchurl, pkg-config, python3, serd, pcre, wafHook }: stdenv.mkDerivation rec { pname = "sord"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pcre ]; propagatedBuildInputs = [ serd ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://drobilla.net/software/sord"; description = "A lightweight C library for storing RDF data in memory"; license = licenses.mit; diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix index fe0d93344c0..5ea23aae879 100644 --- a/pkgs/development/libraries/soxt/default.nix +++ b/pkgs/development/libraries/soxt/default.nix @@ -1,4 +1,4 @@ -{ fetchhg, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU, libGL }: +{ fetchhg, lib, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU, libGL }: stdenv.mkDerivation { pname = "soxt"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ coin3d motif xlibsWrapper libGLU libGL libXmu ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home"; license = licenses.bsd3; description = "A GUI binding for using Open Inventor with Xt/Motif"; diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix index ac587f0492b..b3522afdf86 100644 --- a/pkgs/development/libraries/spandsp/3.nix +++ b/pkgs/development/libraries/spandsp/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }: stdenv.mkDerivation rec { version = "3.0.0"; pname = "spandsp"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "A portable and modular SIP User-Agent with audio and video support"; homepage = "https://github.com/freeswitch/spandsp"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ ajs124 ]; - license = stdenv.lib.licenses.gpl2; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ ajs124 ]; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index 1f9834c08f4..85a3059f27b 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, audiofile, libtiff}: +{lib, stdenv, fetchurl, audiofile, libtiff}: stdenv.mkDerivation rec { version = "0.0.6"; pname = "spandsp"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { meta = { description = "A portable and modular SIP User-Agent with audio and video support"; homepage = "http://www.creytiv.com/baresip.html"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [raskin]; - license = stdenv.lib.licenses.gpl2; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [raskin]; + license = lib.licenses.gpl2; downloadPage = "http://www.soft-switch.org/downloads/spandsp/"; inherit version; updateWalker = true; diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/development/libraries/sparsehash/default.nix index 6007560a11f..41b765bcb07 100644 --- a/pkgs/development/libraries/sparsehash/default.nix +++ b/pkgs/development/libraries/sparsehash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "sparsehash-2.0.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1pf1cjvcjdmb9cd6gcazz64x0cd2ndpwh6ql2hqpypjv725xwxy7"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sparsehash/sparsehash"; description = "An extremely memory-efficient hash_map implementation"; platforms = platforms.all; diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 2e6a7ff2199..ffded04510b 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, sqlite, expat, zlib, proj, geos, libspatialite, readosm }: +{ lib, stdenv, fetchurl, pkg-config, sqlite, expat, zlib, proj, geos, libspatialite, readosm }: stdenv.mkDerivation rec { name = "spatialite-tools-4.1.1"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A complete sqlite3-compatible CLI front-end for libspatialite"; homepage = "https://www.gaia-gis.it/fossil/spatialite-tools"; - license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; - platforms = stdenv.lib.platforms.linux; + license = with lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index 1b5abe16f37..a0c875079c4 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , fetchpatch @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of libraries for fast user-mode storage"; homepage = "https://spdk.io/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index fbe7af1825e..1bd73990443 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, fmt }: +{ lib, stdenv, fetchFromGitHub, cmake, fmt }: let generic = { version, sha256 }: @@ -34,7 +34,7 @@ let doCheck = true; preCheck = "export LD_LIBRARY_PATH=$(pwd):$LD_LIBRARY_PATH"; - meta = with stdenv.lib; { + meta = with lib; { description = "Very fast, header only, C++ logging library"; homepage = "https://github.com/gabime/spdlog"; license = licenses.mit; diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 771ad033ed9..c54b4a3721f 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, ncurses }: +{ lib, stdenv, fetchurl, alsaLib, ncurses }: stdenv.mkDerivation rec { name = "speech_tools-${version}.0"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Text-to-speech engine"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index a3c0f7b2ad8..6e8e6948af0 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , substituteAll , pkg-config , fetchurl @@ -24,7 +24,7 @@ }: let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; inherit (python3Packages) python pyxdg wrapPython; # speechd hard-codes espeak, even when built without support for it. @@ -110,7 +110,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Common interface to speech synthesis"; homepage = "https://devel.freebsoft.org/speechd"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index cd48a591307..9633f435fb8 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkg-config, fftw, speexdsp }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw, speexdsp }: stdenv.mkDerivation rec { name = "speex-1.2.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--with-fft=gpl-fftw3" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.speex.org/"; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 75d8b7fbc93..f87d79ca6e4 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkg-config, fftw }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw }: stdenv.mkDerivation rec { name = "speexdsp-1.2.0"; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-fft=gpl-fftw3" - ] ++ stdenv.lib.optional stdenv.isAarch64 "--disable-neon"; + ] ++ lib.optional stdenv.isAarch64 "--disable-neon"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.speex.org/"; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix index 40ef2772681..a7d59cd8bf6 100644 --- a/pkgs/development/libraries/sphinxbase/default.nix +++ b/pkgs/development/libraries/sphinxbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , bison , pkg-config @@ -21,12 +21,12 @@ stdenv.mkDerivation (rec { meta = { description = "Support Library for Pocketsphinx"; homepage = "http://cmusphinx.sourceforge.net"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ]; }; -} // (stdenv.lib.optionalAttrs multipleOutputs { +} // (lib.optionalAttrs multipleOutputs { outputs = [ "out" "lib" "headers" ]; postInstall = '' diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 03066e8990c..3d76e67f67a 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , acl , cyrus_sasl @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { spice-protocol usbredir zlib - ] ++ stdenv.lib.optionals withPolkit [ polkit acl usbutils ] ; + ] ++ lib.optionals withPolkit [ polkit acl usbutils ] ; PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { "-Dpulse=disabled" # is deprecated upstream ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GTK 3 SPICE widget"; longDescription = '' spice-gtk is a GTK 3 SPICE widget. It features glib-based diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index cae975b9a58..07b670a2718 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "spice-protocol"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ln -sv ../share/pkgconfig $out/lib/pkgconfig ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Protocol headers for the SPICE protocol"; homepage = "https://www.spice-space.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 86aa56f6c30..584b1e15a8e 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { ln -s spice-server $out/include/spice ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Complete open source solution for interaction with virtualized desktop devices"; longDescription = '' The Spice project aims to provide a complete open source solution for interaction diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 79b8e7c2dda..9d464f7300a 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "spirv-headers"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Machine-readable components of the Khronos SPIR-V Registry"; license = licenses.mit; diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index f40c80391a2..cc5656dcc64 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { installManPage sqlcipher.1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.zetetic.net/sqlcipher/"; description = "SQLite extension that provides 256 bit AES encryption of database files"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index f0bbc93a6f1..fe10e0fc7ae 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }: +{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }: assert interactive -> readline != null && ncurses != null; -with stdenv.lib; +with lib; let - archiveVersion = import ./archive-version.nix stdenv.lib; + archiveVersion = import ./archive-version.nix lib; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix index abfb688e461..0828f2f4554 100644 --- a/pkgs/development/libraries/sqlite/sqlar.nix +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fuse, zlib }: +{ lib, stdenv, fetchurl, fuse, zlib }: stdenv.mkDerivation { pname = "sqlar"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { install -D -t $out/bin sqlar sqlarfs ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sqlite.org/sqlar"; description = "SQLite Archive utilities"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 0eb913adb3b..3ec528719e9 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, unzip, sqlite, tcl, Foundation }: +{ lib, stdenv, fetchurl, unzip, sqlite, tcl, Foundation }: let - archiveVersion = import ./archive-version.nix stdenv.lib; + archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { inherit pname; version = "3.34.0"; @@ -12,13 +12,13 @@ let }; nativeBuildInputs = [ unzip ]; - buildInputs = [ tcl ] ++ stdenv.lib.optional stdenv.isDarwin Foundation; + buildInputs = [ tcl ] ++ lib.optional stdenv.isDarwin Foundation; makeFlags = [ makeTarget ]; installPhase = "install -Dt $out/bin ${makeTarget}"; - meta = with stdenv.lib; { + meta = with lib; { inherit description homepage; downloadPage = http://sqlite.org/download.html; license = licenses.publicDomain; diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix index 6947c674a91..c8d8fafbf35 100644 --- a/pkgs/development/libraries/srt/default.nix +++ b/pkgs/development/libraries/srt/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, openssl +{ lib, stdenv, fetchFromGitHub, cmake, openssl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "srt"; version = "1.4.2"; diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index 7380838b78e..0dbfef2c639 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, pkg-config +{ lib, stdenv, fetchFromGitHub, pkg-config , openssl ? null, libpcap ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libsrtp"; version = "2.3.0"; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index ec9a18ef476..f334bb2f35a 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, libxcb, pkg-config, xcbutil}: +{lib, stdenv, fetchurl, libX11, libxcb, pkg-config, xcbutil}: let version = "0.12"; @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.freedesktop.org/software/startup-notification"; description = "Application startup notification and feedback library"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix index 8e57222ded0..a3020e14d3e 100644 --- a/pkgs/development/libraries/stb/default.nix +++ b/pkgs/development/libraries/stb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "stb"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp *.h $out/include/stb/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Single-file public domain libraries for C/C++"; homepage = "https://github.com/nothings/stb"; license = licenses.publicDomain; diff --git a/pkgs/development/libraries/stellarsolver/default.nix b/pkgs/development/libraries/stellarsolver/default.nix index 69417299615..8badf60d942 100644 --- a/pkgs/development/libraries/stellarsolver/default.nix +++ b/pkgs/development/libraries/stellarsolver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, qtbase, cfitsio, gsl, wcslib, withTester ? false }: mkDerivation rec { @@ -20,7 +20,7 @@ mkDerivation rec { "-DBUILD_TESTER=${if withTester then "on" else "off"}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rlancaste/stellarsolver"; description = "Astrometric plate solving library"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index b0da3dbfa27..20676c16b9c 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, libiconv }: +{ lib, stdenv, fetchurl, ncurses, libiconv }: stdenv.mkDerivation rec { name = "stfl-0.24"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildPhase = '' sed -i s/gcc/cc/g Makefile sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h - '' + ( stdenv.lib.optionalString stdenv.isDarwin '' + '' + ( lib.optionalString stdenv.isDarwin '' sed -i s/-soname/-install_name/ Makefile '' ) + '' make @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.clifford.at/stfl/"; description = "A library which implements a curses-based widget set for text terminals"; - maintainers = with stdenv.lib.maintainers; [ lovek323 ]; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ lovek323 ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix index 2d344ab293d..5af77d90053 100644 --- a/pkgs/development/libraries/stlport/default.nix +++ b/pkgs/development/libraries/stlport/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "STLport-5.2.1"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of the C++ Standard Library"; homepage = "https://sourceforge.net/projects/stlport/"; - license = stdenv.lib.licenses.free; # seems BSD-like + license = lib.licenses.free; # seems BSD-like broken = true; # probably glibc-2.20 -related issue }; } diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index fead2c8c1a5..eec4f722d41 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake +{ lib, stdenv, fetchurl, cmake , parallel ? true }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { inherit parallel; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations"; homepage = "https://github.com/stxxl/stxxl"; license = licenses.boost; diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix index d7dcdd50066..cb824decc6c 100644 --- a/pkgs/development/libraries/subunit/default.nix +++ b/pkgs/development/libraries/subunit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, check, cppunit, perl, pythonPackages }: +{ lib, stdenv, fetchurl, pkg-config, check, cppunit, perl, pythonPackages }: # NOTE: for subunit python library see pkgs/top-level/python-packages.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { postFixup = "wrapPythonPrograms"; - meta = with stdenv.lib; { + meta = with lib; { description = "A streaming protocol for test results"; homepage = "https://launchpad.net/subunit"; license = licenses.asl20; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index a17b300d6be..f8db8f3c379 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cmake , fetchurl , fetchpatch @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ python ] - ++ stdenv.lib.optionals (lapackSupport) + ++ lib.optionals (lapackSupport) # Check that the same index size is used for both libraries (assert (blas.isILP64 == lapack.isILP64); [ gfortran @@ -46,16 +46,16 @@ stdenv.mkDerivation rec { # KLU support is based on Suitesparse. # It is tested upstream according to the section 1.1.4 of # [INSTALL_GUIDE.pdf](https://raw.githubusercontent.com/LLNL/sundials/master/INSTALL_GUIDE.pdf) - ++ stdenv.lib.optionals (kluSupport) [ + ++ lib.optionals (kluSupport) [ suitesparse ]; cmakeFlags = [ "-DEXAMPLES_INSTALL_PATH=${placeholder "examples"}/share/examples" - ] ++ stdenv.lib.optionals (lapackSupport) [ + ] ++ lib.optionals (lapackSupport) [ "-DENABLE_LAPACK=ON" "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" - ] ++ stdenv.lib.optionals (kluSupport) [ + ] ++ lib.optionals (kluSupport) [ "-DENABLE_KLU=ON" "-DKLU_INCLUDE_DIR=${suitesparse.dev}/include" "-DKLU_LIBRARY_DIR=${suitesparse}/lib" @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { description = "Suite of nonlinear differential/algebraic equation solvers"; homepage = "https://computation.llnl.gov/projects/sundials"; platforms = platforms.all; diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix index c7320f7722b..fbc17a5e7b2 100644 --- a/pkgs/development/libraries/svrcore/default.nix +++ b/pkgs/development/libraries/svrcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, nss, nspr }: +{ lib, stdenv, fetchurl, pkg-config, nss, nspr }: stdenv.mkDerivation rec { pname = "svrcore"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nss nspr ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Secure PIN handling using NSS crypto"; license = licenses.mpl11; platforms = platforms.all; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 2fe20cc9e88..980d034682f 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, fetchurl, openssl, boost, sconsPackages }: +{ lib, stdenv, python, fetchurl, openssl, boost, sconsPackages }: stdenv.mkDerivation rec { pname = "swiften"; version = "4.0.2"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "An XMPP library for C++, used by the Swift client"; homepage = "http://swift.im/swiften.html"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix index 3631b8b4fe7..2c508a3735f 100644 --- a/pkgs/development/libraries/swiftshader/default.nix +++ b/pkgs/development/libraries/swiftshader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python3, cmake, jq, libX11, libXext, zlib }: +{ lib, stdenv, fetchgit, python3, cmake, jq, libX11, libXext, zlib }: stdenv.mkDerivation rec { pname = "swiftshader"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-performance CPU-based implementation of the Vulkan, OpenGL ES, and Direct3D 9 graphics APIs"; homepage = "https://opensource.google/projects/swiftshader"; diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 54c2b6fae0d..35c1e6e15e2 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, icu, clucene_core, curl }: +{ lib, stdenv, fetchurl, pkg-config, icu, clucene_core, curl }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "-DU_USING_ICU_NAMESPACE=1" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A software framework that allows research manipulation of Biblical texts"; homepage = "http://www.crosswire.org/sword/"; longDescription = '' diff --git a/pkgs/development/libraries/sycl-info/default.nix b/pkgs/development/libraries/sycl-info/default.nix index f294c887b0c..9d86017e084 100644 --- a/pkgs/development/libraries/sycl-info/default.nix +++ b/pkgs/development/libraries/sycl-info/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , installShellFiles , cmake @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { "-DBUILD_TESTING=ON" "-DBUILD_DOCS=ON" "-DBUILD_SHARED_LIBS=ON" - "-DLYRA_INCLUDE_DIRS=${stdenv.lib.getDev lyra}/include" + "-DLYRA_INCLUDE_DIRS=${lib.getDev lyra}/include" ]; # Required for ronn to compile the manpage. RUBYOPT = "-KU -E utf-8:utf-8"; - meta = with stdenv.lib; + meta = with lib; { homepage = "https://github.com/codeplaysoftware/sycl-info"; description = "Tool to show information about available SYCL implementations"; diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index cc3abd80d6f..3a3f5c79763 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , gmp @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ctest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast symbolic manipulation library"; homepage = "https://github.com/symengine/symengine"; platforms = platforms.unix ++ platforms.windows; diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index 4f11f42de52..f6d0c619c77 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "szip"; @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { description = "Compression library that can be used with the hdf5 library"; homepage = "https://www.hdfgroup.org/doc_resource/SZIP/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 7d42abc6ea1..495993a64ab 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libX11, libXaw }: +{ lib, stdenv, fetchurl, fetchpatch, libX11, libXaw }: let getPatch = { name, sha256 }: fetchpatch { @@ -28,9 +28,9 @@ stdenv.mkDerivation { buildInputs = [ libX11 libXaw ]; buildFlags = [ "without_doc" ]; - postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? + postInstall = lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? - meta = with stdenv.lib; { + meta = with lib; { description = "A type 1 font rasterizer library for UNIX/X11"; homepage = "http://www.t1lib.org/"; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 90aa62d946f..f536442295e 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , Carbon ? null , libjpeg ? null @@ -18,19 +18,19 @@ stdenv.mkDerivation rec { url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ Carbon - ] ++ stdenv.lib.optionals withJpegSupport [ + ] ++ lib.optionals withJpegSupport [ libjpeg - ] ++ stdenv.lib.optionals withPngSupport [ + ] ++ lib.optionals withPngSupport [ libpng ]; preBuild = '' cd unix - '' + stdenv.lib.optionalString withJpegSupport '' + '' + lib.optionalString withJpegSupport '' export USEJPEG=" -DUSEJPEG" export JPEGLIB=" -ljpeg" - '' + stdenv.lib.optionalString withPngSupport '' + '' + lib.optionalString withPngSupport '' export USEPNG=" -DUSEPNG" export PNGLIB=" -lpng -lz" ''; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ./make-archs.patch ] ++ # Ensure looks for nix-provided Carbon, not system frameworks - stdenv.lib.optional stdenv.isDarwin ./darwin.patch; + lib.optional stdenv.isDarwin ./darwin.patch; installPhase = '' cd ../compile/${arch} @@ -67,9 +67,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "A Parallel / Multiprocessor Ray Tracing System"; - license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = with stdenv.lib.platforms; linux ++ cygwin ++ darwin; + license = lib.licenses.bsd3; + maintainers = [lib.maintainers.raskin]; + platforms = with lib.platforms; linux ++ cygwin ++ darwin; homepage = "http://jedi.ks.uiuc.edu/~johns/tachyon/"; }; } diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix index b667e604740..44e107693c9 100644 --- a/pkgs/development/libraries/taglib-extras/default.nix +++ b/pkgs/development/libraries/taglib-extras/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, taglib}: +{lib, stdenv, fetchurl, cmake, taglib}: stdenv.mkDerivation rec { name = "taglib-extras-1.0.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Additional taglib plugins"; platforms = platforms.unix; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix index fe1bc5fcd59..78a4026455e 100644 --- a/pkgs/development/libraries/taglib-sharp/default.nix +++ b/pkgs/development/libraries/taglib-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono }: stdenv.mkDerivation rec { pname = "taglib-sharp"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-docs" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for reading and writing metadata in media files"; homepage = "https://github.com/mono/taglib-sharp"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 28373605a6b..3fcfaa12339 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fetchpatch +{ lib, stdenv, fetchurl, cmake, fetchpatch , zlib }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://taglib.org/"; repositories.git = "git://github.com/taglib/taglib.git"; description = "A library for reading and editing audio file metadata"; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index fa920d037a9..553c42da7c4 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python3 , pkg-config @@ -43,7 +43,7 @@ stdenv.mkDerivation (rec { ]; # this must not be exported before the ConfigurePhase otherwise waf whines - preBuild = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + preBuild = lib.optionalString stdenv.hostPlatform.isMusl '' export NIX_CFLAGS_LINK="-no-pie -shared"; ''; @@ -51,13 +51,13 @@ stdenv.mkDerivation (rec { ${stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc.c.[0-9]*.o ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Hierarchical pool based memory allocator with destructors"; homepage = "https://tdb.samba.org/"; license = licenses.gpl3; platforms = platforms.all; }; -} // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { +} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { # python-config from build Python gives incorrect values when cross-compiling. # If python-config is not found, the build falls back to using the sysconfig # module, which works correctly when cross-compiling. diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 264b34125a8..2047b0d5bc2 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: +{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: -with stdenv.lib; stdenv.mkDerivation rec { +with lib; stdenv.mkDerivation rec { pname = "tbb"; version = "2019_U9"; @@ -16,7 +16,7 @@ with stdenv.lib; stdenv.mkDerivation rec { makeFlags = optional (compiler != null) "compiler=${compiler}" ++ optional (stdver != null) "stdver=${stdver}"; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch; + patches = lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch; installPhase = '' runHook preInstall diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index 22fd7b11681..451f17a2cd7 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "tclap-1.2.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://tclap.sourceforge.net/"; description = "Templatized C++ Command Line Parser Library"; platforms = platforms.all; diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index 2cb65b9c698..4cab15ca5c2 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl }: +{ lib, stdenv, fetchurl, tcl }: stdenv.mkDerivation rec { pname = "tcllib"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://sourceforge.net/projects/tcllib/"; description = "Tcl-only library of standard routines for Tcl"; - license = stdenv.lib.licenses.tcltk; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.tcltk; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index c26394f6cd5..e88358bbce0 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, openssl }: +{ lib, stdenv, fetchurl, tcl, openssl }: stdenv.mkDerivation rec { pname = "tcltls"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tls.sourceforge.net/"; description = "An OpenSSL / RSA-bsafe Tcl extension"; - license = stdenv.lib.licenses.tcltk; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.tcltk; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix index 5d4727a1831..85eae730575 100644 --- a/pkgs/development/libraries/tclx/default.nix +++ b/pkgs/development/libraries/tclx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl }: +{ lib, stdenv, fetchurl, tcl }: stdenv.mkDerivation rec { name = "tclx-${version}.${patch}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tclx.sourceforge.net/"; description = "Tcl extensions"; - license = stdenv.lib.licenses.tcltk; - maintainers = with stdenv.lib.maintainers; [ kovirobi ]; + license = lib.licenses.tcltk; + maintainers = with lib.maintainers; [ kovirobi ]; }; } diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index b8e6552bc7b..658bdb2f9d5 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , wafHook @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The trivial database"; longDescription = '' TDB is a Trivial Database. In concept, it is very much like GDBM, diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 1a36a68a33b..895faa8847a 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }: +{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, lib, stdenv }: stdenv.mkDerivation rec { version = "1.7.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ gperf openssl readline zlib ]; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform library for building Telegram clients"; homepage = "https://core.telegram.org/tdlib/"; license = [ licenses.boost ]; diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index a47f39be10a..6d8a334ce3f 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "tecla-1.6.3"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { description = "Command-line editing library"; license = "as-is"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index a30d8d01c49..2885f3cbb12 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, telepathy-glib, farstream, dbus-glib }: +{ lib, stdenv, fetchurl, pkg-config, telepathy-glib, farstream, dbus-glib }: stdenv.mkDerivation rec { name = "${pname}-0.6.2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ]; nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call"; homepage = "https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index ec9dfab120f..8bb7522b197 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt +{ lib, stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt , gobject-introspection, vala, glibcLocales }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { passthru.python = python2; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://telepathy.freedesktop.org"; platforms = platforms.unix; license = with licenses; [ bsd2 bsd3 lgpl21Plus ]; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 888d98b957f..b606c56445e 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus +{ lib, stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus , telepathy-farstream, telepathy-glib, fetchpatch }: let @@ -18,11 +18,11 @@ in stdenv.mkDerivation rec { # No point in building tests if they are not run # On 0.9.7, they do not even build with QT4 - cmakeFlags = stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; + cmakeFlags = lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; doCheck = false; # giving up for now - meta = with stdenv.lib; { + meta = with lib; { description = "Telepathy Qt bindings"; homepage = "https://telepathy.freedesktop.org/components/telepathy-qt/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index 0c4fd9da147..2c89e3f433a 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: let version = "3.34.0"; pname = "template-glib"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1z9xkin5fyfh071ma9y045jcw83hgx33dfbjraw6cxk0qdmfysr1"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A library for template expansion which supports calling into GObject Introspection from templates"; homepage = "https://gitlab.gnome.org/GNOME/template-glib"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index 77cf9fd0247..d9d74081735 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0x2s0ks575b57jdqnp9r9miz40pm705n2dlj2k8bfj1hyl22kgf6"; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gnome3.updateScript { packageName = pname; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Tepl"; description = "Text editor product line"; maintainers = teams.gnome.members ++ [ maintainers.manveru ]; diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix index 22082f7198f..e809240bcd1 100644 --- a/pkgs/development/libraries/termbox/default.nix +++ b/pkgs/development/libraries/termbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }: stdenv.mkDerivation rec { pname = "termbox"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 wafHook ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for writing text-based user interfaces"; license = licenses.mit; homepage = "https://github.com/nsf/termbox#readme"; diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 2d5fd0564ba..568751f48aa 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , python3 , pkg-config @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An event system based on the talloc memory management library"; homepage = "https://tevent.samba.org/"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index 85dc2c75afb..3d39075dd26 100644 --- a/pkgs/development/libraries/theft/default.nix +++ b/pkgs/development/libraries/theft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "0.4.5"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { --replace "/usr/local" "$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A C library for property-based testing"; homepage = "https://github.com/silentbicycle/theft/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/thrift/0.10.nix b/pkgs/development/libraries/thrift/0.10.nix index 25da474099c..a735e146214 100644 --- a/pkgs/development/libraries/thrift/0.10.nix +++ b/pkgs/development/libraries/thrift/0.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkg-config, bison +{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkg-config, bison , flex, twisted }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tests=no" ]; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for scalable cross-language services"; homepage = "http://thrift.apache.org/"; license = licenses.asl20; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 5a9547a959f..669dff21147 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkg-config +{ lib, stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkg-config , bison, flex, twisted , static ? stdenv.hostPlatform.isStatic }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config bison flex ]; buildInputs = [ boost zlib libevent openssl ] - ++ stdenv.lib.optionals (!static) [ python twisted ]; + ++ lib.optionals (!static) [ python twisted ]; preConfigure = "export PY_PREFIX=$out"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # FIXME: Fails to link in static mode with undefined reference to # `boost::unit_test::unit_test_main(bool (*)(), int, char**)' "-DBUILD_TESTING:BOOL=${if static then "OFF" else "ON"}" - ] ++ stdenv.lib.optionals static [ + ] ++ lib.optionals static [ "-DWITH_STATIC_LIB:BOOL=ON" "-DOPENSSL_USE_STATIC_LIBS=ON" ]; @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - ${stdenv.lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E PythonTestSSLSocket + ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E PythonTestSSLSocket runHook postCheck ''; enableParallelChecking = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for scalable cross-language services"; homepage = "http://thrift.apache.org/"; license = licenses.asl20; diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 3d163ef6ded..044c09a5bc4 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, autoreconfHook, libkrb5 }: +{ fetchurl, lib, stdenv, autoreconfHook, libkrb5 }: stdenv.mkDerivation rec { pname = "libtirpc"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://sourceforge.net/projects/libtirpc/"; description = "The transport-independent Sun RPC implementation (TI-RPC)"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/ticpp/default.nix b/pkgs/development/libraries/ticpp/default.nix index 37b093c8e2e..20de3d7f2b8 100644 --- a/pkgs/development/libraries/ticpp/default.nix +++ b/pkgs/development/libraries/ticpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "Interface to TinyXML"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/wxFormBuilder/ticpp"; }; diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix index f75b8cb0151..5c0ad8463b4 100644 --- a/pkgs/development/libraries/tidyp/default.nix +++ b/pkgs/development/libraries/tidyp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "tidyp-1.04"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A program that can validate your HTML, as well as modify it to be more clean and standard"; homepage = "http://tidyp.com/"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/timezonemap/default.nix b/pkgs/development/libraries/timezonemap/default.nix index 6f561eac04e..372b0e74b06 100644 --- a/pkgs/development/libraries/timezonemap/default.nix +++ b/pkgs/development/libraries/timezonemap/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoreconfHook , fetchbzr , pkg-config @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { sed "s|/usr/share/libtimezonemap|$out/share/libtimezonemap|g" -i ./src/tz.h ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://launchpad.net/timezonemap"; description = "A GTK+3 Timezone Map Widget"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/tinycbor/default.nix b/pkgs/development/libraries/tinycbor/default.nix index 62f2a807185..d03e20cb7e2 100644 --- a/pkgs/development/libraries/tinycbor/default.nix +++ b/pkgs/development/libraries/tinycbor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "tinycbor"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Concise Binary Object Representation (CBOR) Library"; homepage = "https://github.com/intel/tinycbor"; license = licenses.mit; diff --git a/pkgs/development/libraries/tinyobjloader/default.nix b/pkgs/development/libraries/tinyobjloader/default.nix index 92eb5b3d8f4..c7939a6be25 100644 --- a/pkgs/development/libraries/tinyobjloader/default.nix +++ b/pkgs/development/libraries/tinyobjloader/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tinyobjloader/tinyobjloader"; description = "Tiny but powerful single file wavefront obj loader"; license = licenses.mit; diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix index 310b5a447c7..1e2eea7ac89 100644 --- a/pkgs/development/libraries/tinyxml-2/default.nix +++ b/pkgs/development/libraries/tinyxml-2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "tinyxml-2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple, small, efficient, C++ XML parser"; homepage = "http://www.grinninglizard.com/tinyxml2/index.html"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.zlib; + platforms = lib.platforms.unix; + license = lib.licenses.zlib; }; } diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index 7b6b0f9390e..e8c5dd1dacd 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let version = "2.6.2"; @@ -28,7 +28,7 @@ in stdenv.mkDerivation { hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = - stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; + lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; nativeBuildInputs = [ unzip ]; buildPhase = '' @@ -67,14 +67,14 @@ in stdenv.mkDerivation { cp -v tinyxml.pc $out/lib/pkgconfig/ cp -v docs/* $out/share/doc/tinyxml/ - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' install_name_tool -id $out/lib/libtinyxml.dylib $out/lib/libtinyxml.dylib ''; meta = { description = "Simple, small, C++ XML parser that can be easily integrating into other programs"; homepage = "http://www.grinninglizard.com/tinyxml/index.html"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.free; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index 52fffb42aa2..e0f91330efc 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tk, fetchpatch } : +{ lib, stdenv, fetchurl, tcl, tk, fetchpatch } : stdenv.mkDerivation { version = "8.4.3"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; sha256 = "0wzqmcxxq0rqpnjgxz10spw92yhfygnlwv0h8pcx2ycnqiljz6vj"; }) - ] ++ stdenv.lib.optional (tcl.release == "8.6") + ] ++ lib.optional (tcl.release == "8.6") (fetchpatch { name = "tix-8.4.3-tcl8.6.patch"; url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; @@ -42,7 +42,7 @@ stdenv.mkDerivation { "--libdir=\${prefix}/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A widget library for Tcl/Tk"; homepage = "http://tix.sourceforge.net/"; platforms = platforms.all; diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index c30f9a81947..fdffbeba2c9 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, tcl, stdenv, ... } @ args: +{ callPackage, fetchurl, tcl, lib, stdenv, ... } @ args: callPackage ./generic.nix (args // { @@ -7,6 +7,6 @@ callPackage ./generic.nix (args // { sha256 = "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg"; }; - patches = [ ./different-prefix-with-tcl.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; + patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; }) diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 1d04ce5a1b9..57dc3dac2d0 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -21,15 +21,15 @@ stdenv.mkDerivation { cp ../{unix,generic}/*.h $out/include ln -s $out/lib/libtk${tcl.release}${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libtk${stdenv.hostPlatform.extensions.sharedLibrary} '' - + stdenv.lib.optionalString (stdenv.isDarwin) '' + + lib.optionalString (stdenv.isDarwin) '' cp ../macosx/*.h $out/include ''; configureFlags = [ "--enable-threads" "--with-tcl=${tcl}/lib" - ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit" - ++ stdenv.lib.optional enableAqua "--enable-aqua"; + ] ++ lib.optional stdenv.is64bit "--enable-64bit" + ++ lib.optional enableAqua "--enable-aqua"; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optional enableAqua (with darwin.apple_sdk.frameworks; [ Cocoa ]); @@ -46,7 +46,7 @@ stdenv.mkDerivation { libdir = "lib/${libPrefix}"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages"; homepage = "https://www.tcl.tk/"; license = licenses.tcltk; diff --git a/pkgs/development/libraries/tl-expected/default.nix b/pkgs/development/libraries/tl-expected/default.nix index e91c42c884c..4915fd7e700 100644 --- a/pkgs/development/libraries/tl-expected/default.nix +++ b/pkgs/development/libraries/tl-expected/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "tl-expected-unstable"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "C++11/14/17 std::expected with functional-style extensions"; homepage = "https://tl.tartanllama.xyz/en/latest/api/expected.html"; license = licenses.cc0; diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index 93b760bc88f..932239a485f 100644 --- a/pkgs/development/libraries/tnt/default.nix +++ b/pkgs/development/libraries/tnt/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { pname = "tnt"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = "https://math.nist.gov/tnt/"; description = "Template Numerical Toolkit: C++ headers for array and matrices"; - license = stdenv.lib.licenses.publicDomain; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.publicDomain; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index ff14c8c3305..a21a71b89bf 100644 --- a/pkgs/development/libraries/tntdb/default.nix +++ b/pkgs/development/libraries/tntdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }: +{ lib, stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }: stdenv.mkDerivation rec { pname = "tntdb"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.tntnet.org/tntdb.html"; description = "C++ library which makes accessing SQL databases easy and robust"; platforms = platforms.linux ; diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix index 332750d7694..a80b923e235 100644 --- a/pkgs/development/libraries/tntnet/default.nix +++ b/pkgs/development/libraries/tntnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cxxtools, zlib, openssl, zip }: +{ lib, stdenv, fetchurl, cxxtools, zlib, openssl, zip }: stdenv.mkDerivation rec { pname = "tntnet"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.tntnet.org/tntnet.html"; description = "Web server which allows users to develop web applications using C++"; platforms = platforms.linux ; diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix index b8969588b3c..22d3266b93a 100644 --- a/pkgs/development/libraries/tokyo-cabinet/default.nix +++ b/pkgs/development/libraries/tokyo-cabinet/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zlib, bzip2 }: +{ fetchurl, lib, stdenv, zlib, bzip2 }: stdenv.mkDerivation rec { name = "tokyocabinet-1.4.48"; @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { robustness, supports 64-bit architecture. ''; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index e970fb6786c..e5aeae6aae0 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, tokyocabinet, pkg-config }: +{ fetchurl, lib, stdenv, tokyocabinet, pkg-config }: stdenv.mkDerivation rec { name = "tokyotyrant-1.1.41"; @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { homepage = "https://fallabs.com/tokyotyrant/"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index 27498fdaaf8..c93ec8dccf9 100644 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "totem-pl-parser"; version = "3.26.5"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "132jihnf51zs98yjkc6jxyqib4f3dawpjm17g4bj4j78y93dww2k"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection ]; buildInputs = [ libxml2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Videos"; description = "Simple GObject-based library to parse and save a host of playlist formats"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index dc6d30061d6..2ca5dd6bd93 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , substituteAll , asciidoc @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { version = "3.0.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1kfi5d6pccqx28hbnja6k1mpwjd53k5zs704sg01rlzmbshz1zn6"; }; @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Tracker"; description = "Desktop-neutral user information store, search tool and indexer"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index f883268cc28..38885048fcc 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , gettext @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1rhcs75axga7p7hl37h6jzb2az89jddlcwc7ykrnb2khyhka78rr"; }; @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Tracker"; description = "Desktop-neutral user information store, search tool and indexer"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index 80806848846..e515dd1673f 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch}: +{lib, stdenv, fetchurl, fetchpatch}: stdenv.mkDerivation rec { name = "tre-0.8.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight and robust POSIX compliant regexp matching library"; homepage = "https://laurikari.net/tre/"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.bsd2; + platforms = lib.platforms.unix; + license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index f7ac1a57f4a..16e1a78d396 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, libogg }: +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, libogg }: stdenv.mkDerivation { name = "tremor-unstable-2018-03-16"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = "https://xiph.org/tremor/"; description = "Fixed-point version of the Ogg Vorbis decoder"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix index 929627f3e1b..800b3564011 100644 --- a/pkgs/development/libraries/trompeloeil/default.nix +++ b/pkgs/development/libraries/trompeloeil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "trompeloeil"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Header only C++14 mocking framework"; homepage = "https://github.com/rollbear/trompeloeil"; license = licenses.boost; diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index f2018286a3e..728c6e71f7f 100644 --- a/pkgs/development/libraries/tsocks/default.nix +++ b/pkgs/development/libraries/tsocks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tsocks"; @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { -e "/SAVE/d" Makefile ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Transparent SOCKS v4 proxying library"; homepage = "http://tsocks.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ edwtjo phreedom ]; platforms = platforms.unix; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/development/libraries/tweeny/default.nix b/pkgs/development/libraries/tweeny/default.nix index f2de470288d..c1737f6f017 100644 --- a/pkgs/development/libraries/tweeny/default.nix +++ b/pkgs/development/libraries/tweeny/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern C++ tweening library"; license = licenses.mit; homepage = "http://mobius3.github.io/tweeny"; diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index 6ccd853de0a..3537dd3029b 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config , libsndfile }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { doCheck = false; # fails with "../build-scripts/test-driver: line 107: -Mstrict: command not found" - meta = with stdenv.lib;{ + meta = with lib;{ description = "A MP2 encoder"; longDescription = '' TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix index 1f7124411ac..db947d373a2 100644 --- a/pkgs/development/libraries/ubus/default.nix +++ b/pkgs/development/libraries/ubus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchgit, libubox, libjson }: +{ lib, stdenv, cmake, fetchgit, libubox, libjson }: stdenv.mkDerivation { pname = "ubus"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ libubox libjson ]; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenWrt system message/RPC bus"; homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix index 951e62cae0d..0a5af8b907b 100644 --- a/pkgs/development/libraries/uci/default.nix +++ b/pkgs/development/libraries/uci/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchgit, pkg-config, libubox }: +{ lib, stdenv, cmake, fetchgit, pkg-config, libubox }: stdenv.mkDerivation { pname = "uci"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ libubox ]; nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenWrt Unified Configuration Interface"; homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix index f25a6313752..43f7ddf63af 100644 --- a/pkgs/development/libraries/ucl/default.nix +++ b/pkgs/development/libraries/ucl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "ucl-1.03"; @@ -8,12 +8,12 @@ stdenv.mkDerivation { }; # needed to successfully compile with gcc 6 - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-std=c90"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=c90"; meta = { homepage = "http://www.oberhumer.com/opensource/ucl/"; description = "Portable lossless data compression library"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 5b1af300bab..7cfd9f1edf5 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, pkg-config , openssl ? null, zlib ? null, gnutls ? null }: @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { meta = { description = "C++ library to facilitate using C++ design patterns"; homepage = "https://www.gnu.org/software/commoncpp/"; - license = stdenv.lib.licenses.lgpl3Plus; + license = lib.licenses.lgpl3Plus; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index a4120b7ba43..fae81276878 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, doxygen +{ lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen , numactl, rdma-core, libbfd, libiberty, perl, zlib }: @@ -29,7 +29,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Unified Communication X library"; homepage = "http://www.openucx.org"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix index 41fb6e7abff..fc0b4a42b55 100644 --- a/pkgs/development/libraries/udns/default.nix +++ b/pkgs/development/libraries/udns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: # this expression is mostly based on debian's packaging # https://tracker.debian.org/media/packages/u/udns/rules-0.4-1 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # keep man3 outputDevdoc = "out"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.corpit.ru/mjt/udns.html"; description = "Async-capable DNS stub resolver library"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index 6b75b7e683f..deed5b64d2c 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, texinfo, bison, flex, expat, file }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook texinfo bison flex file ]; buildInputs = [ expat ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.unidata.ucar.edu/software/udunits/"; description = "A C-based package for the programatic handling of units of physical quantities"; license = licenses.bsdOriginal; diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index 62c105f3b90..ec7626a7e8b 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkg-config }: +{ lib, stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { name = "uid_wrapper-1.2.8"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 5050650635f..d27adb2a061 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , docbook_xsl , fetchurl , glib @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { mv docs/reference $doc/share/doc/umockdev/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mock hardware devices for creating unit tests"; license = licenses.lgpl2; maintainers = with maintainers; [ flokli ]; diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index da5dc2fed7a..f5fd4f82bae 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; makeFlags = [ "PREFIX=$(out)" ] - ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; + ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ libtool ncurses ]; diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index 87ca28fee98..17e91f7e236 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb-compat-0_1, libraw1394, dcraw, intltool, perl, v4l-utils }: +{ lib, stdenv, fetchurl, libusb-compat-0_1, libraw1394, dcraw, intltool, perl, v4l-utils }: stdenv.mkDerivation rec { pname = "libunicap"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sed -e 's@/etc/udev@'"$out"'/&@' -i data/Makefile.* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Universal video capture API"; homepage = "http://www.unicap-imaging.org/"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix index ce3dfa24faa..7f768d9631b 100644 --- a/pkgs/development/libraries/unicorn/default.nix +++ b/pkgs/development/libraries/unicorn/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , pkg-config , cmake @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight multi-platform CPU emulator library"; homepage = "http://www.unicorn-engine.org"; license = licenses.gpl2Only; diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index 17b64d99971..d185d32c816 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchFromGitHub, cmake}: +{lib, stdenv, fetchFromGitHub, cmake}: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "unittest-cpp"; @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Lightweight unit testing framework for C++"; license = licenses.mit; maintainers = []; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index a4fcac2a358..8b2558c0850 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "unixODBC"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ODBC driver manager for Unix"; homepage = "http://www.unixodbc.org/"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 04aa7e6c685..edbe51998c3 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -19,7 +19,7 @@ driver = "lib/psqlodbcw.so"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Official PostgreSQL ODBC Driver"; homepage = "https://odbc.postgresql.org/"; license = licenses.lgpl2; @@ -60,7 +60,7 @@ driver = if stdenv.isDarwin then "lib/libmaodbc.dylib" else "lib/libmaodbc.so"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "MariaDB ODBC database driver"; homepage = "https://downloads.mariadb.org/connector-odbc/"; license = licenses.gpl2; @@ -88,7 +88,7 @@ driver = "lib/libmyodbc3-3.51.12.so"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "MariaDB ODBC database driver"; homepage = "https://dev.mysql.com/downloads/connector/odbc/"; license = licenses.gpl2; @@ -123,7 +123,7 @@ driver = "lib/libsqlite3odbc.so"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "ODBC driver for SQLite"; homepage = "http://www.ch-werner.de/sqliteodbc"; license = licenses.bsd2; @@ -166,7 +166,7 @@ driver = "lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional}"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "ODBC Driver 17 for SQL Server"; homepage = "https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-2017"; license = licenses.unfree; diff --git a/pkgs/development/libraries/unqlite/default.nix b/pkgs/development/libraries/unqlite/default.nix index 9d0ab386856..c0e405c8849 100644 --- a/pkgs/development/libraries/unqlite/default.nix +++ b/pkgs/development/libraries/unqlite/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://unqlite.org/"; description = "Self-contained, serverless, zero-conf, transactional NoSQL DB library"; longDescription = '' diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index c96629072f9..48a80aacdf5 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, doxygen }: +{ lib, stdenv, fetchFromGitHub, cmake, doxygen }: stdenv.mkDerivation rec { name = "uri-${version}"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ URI library"; homepage = "https://cpp-netlib.org"; - license = stdenv.lib.licenses.boost; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.boost; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index a12f040bf49..ad171998480 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { checkInputs = [ gtest ]; doCheck = stdenv.targetPlatform.system == stdenv.hostPlatform.system; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://uriparser.github.io/"; description = "Strictly RFC 3986 compliant URI parsing library"; longDescription = '' diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 159296facc4..0313b8c81ef 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, libusb1 }: +{ lib, stdenv, fetchurl, pkg-config, libusb1 }: stdenv.mkDerivation rec { pname = "usbredir"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "USB traffic redirection protocol"; homepage = "https://www.spice-space.org/usbredir.html"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix index b6bb02d56e4..2b04d8c0c5b 100644 --- a/pkgs/development/libraries/ustr/default.nix +++ b/pkgs/development/libraries/ustr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ustr"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { find $out/lib -name \*debug\* -delete ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.and.org/ustr/"; description = "Micro String API for C language"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix index ef02ca2c313..e627b97849a 100644 --- a/pkgs/development/libraries/utf8cpp/default.nix +++ b/pkgs/development/libraries/utf8cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "utf8cpp"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/nemtrif/utfcpp"; description = "UTF-8 with C++ in a Portable Way"; license = licenses.free; diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index ea455e2c92c..b78999e96a7 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "utf8proc"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A clean C library for processing UTF-8 Unicode data"; homepage = "https://juliastrings.github.io/utf8proc/"; license = licenses.mit; diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index d2c5b6ab11d..7ddae062f76 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: let version = "2.1.0"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { cp ./src/* "$out/include/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A hash table for C structures"; homepage = "http://troydhanson.github.io/uthash"; license = licenses.bsd2; # it's one-clause, actually, as it's source-only diff --git a/pkgs/development/libraries/v8/5_x.nix b/pkgs/development/libraries/v8/5_x.nix index 050abe9e81b..441a5559b52 100644 --- a/pkgs/development/libraries/v8/5_x.nix +++ b/pkgs/development/libraries/v8/5_x.nix @@ -151,11 +151,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; buildInputs = [ readline python icu ] - ++ stdenv.lib.optional stdenv.isDarwin xcbuild - ++ stdenv.lib.optional stdenv.isLinux patchelf; + ++ lib.optional stdenv.isDarwin xcbuild + ++ lib.optional stdenv.isLinux patchelf; NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes" - + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture"; + + lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture"; buildFlags = [ "LINK=c++" diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 40c551d826a..c79073f04e4 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { chmod u+w -R . ''; - postPatch = stdenv.lib.optionalString stdenv.isAarch64 '' + postPatch = lib.optionalString stdenv.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' ''; @@ -95,14 +95,14 @@ stdenv.mkDerivation rec { # ''custom_toolchain="//build/toolchain/linux/unbundle:default"'' ''host_toolchain="//build/toolchain/linux/unbundle:default"'' ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' - ] ++ stdenv.lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; + ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; # with gcc8, -Wclass-memaccess became part of -Wall and causes logging limit # to be exceeded - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess"; nativeBuildInputs = [ gn ninja pkg-config python ] - ++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; + ++ lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; buildInputs = [ glib icu ]; ninjaFlags = [ ":d8" "v8_monolith" ]; diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix index c9dba3d00c9..00e9a2042b7 100644 --- a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix +++ b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }: stdenv.mkDerivation rec { pname = "intel-hybrid-driver"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://01.org/linuxmedia"; description = "Intel driver for the VAAPI library with partial HW acceleration"; license = licenses.mit; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 81edb9caea0..f21a947a533 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkg-config, python3 +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkg-config, python3 , intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext , enableHybridCodec ? false, vaapi-intel-hybrid }: @@ -17,23 +17,23 @@ stdenv.mkDerivation rec { # Set the correct install path: LIBVA_DRIVERS_PATH = "${placeholder "out"}/lib/dri"; - postInstall = stdenv.lib.optionalString enableHybridCodec '' + postInstall = lib.optionalString enableHybridCodec '' ln -s ${vaapi-intel-hybrid}/lib/dri/* $out/lib/dri/ ''; configureFlags = [ "--enable-x11" "--enable-wayland" - ] ++ stdenv.lib.optional enableHybridCodec "--enable-hybrid-codec"; + ] ++ lib.optional enableHybridCodec "--enable-hybrid-codec"; nativeBuildInputs = [ autoreconfHook gnum4 pkg-config python3 ]; buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ] - ++ stdenv.lib.optional enableHybridCodec vaapi-intel-hybrid; + ++ lib.optional enableHybridCodec vaapi-intel-hybrid; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://01.org/linuxmedia"; license = licenses.mit; description = "VA-API user mode driver for Intel GEN Graphics family"; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 66f6b1c6fa5..fd38eba7397 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkg-config }: +{ lib, stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkg-config }: stdenv.mkDerivation rec { pname = "libva-vdpau-driver"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://cgit.freedesktop.org/vaapi/vdpau-driver"; license = licenses.gpl2Plus; description = "VDPAU driver for the VAAPI library"; diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index 024976e0b0f..76ce9a36c71 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, vapoursynth, nasm, fftwFloat }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--libdir=$(out)/lib/vapoursynth" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A set of filters for motion estimation and compensation"; homepage = "https://github.com/dubhater/vapoursynth-mvtools"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 58ed50f9bd9..93f8d3c5ae5 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper , zimg, libass, python3, libiconv , ApplicationServices , ocrSupport ? false, tesseract ? null @@ -8,7 +8,7 @@ assert ocrSupport -> tesseract != null; assert imwriSupport -> imagemagick7 != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "vapoursynth"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : $out/${python3.sitePackages} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A video processing framework with the future in mind"; homepage = "http://www.vapoursynth.com/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/vapoursynth/editor.nix b/pkgs/development/libraries/vapoursynth/editor.nix index 196c700af17..76b50a10907 100644 --- a/pkgs/development/libraries/vapoursynth/editor.nix +++ b/pkgs/development/libraries/vapoursynth/editor.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromBitbucket +{ lib, stdenv, mkDerivation, fetchFromBitbucket , python3, vapoursynth , qmake, qtbase, qtwebsockets }: @@ -10,7 +10,7 @@ mkDerivation rec { src = fetchFromBitbucket { owner = "mystery_keeper"; repo = pname; - rev = stdenv.lib.toLower version; + rev = lib.toLower version; sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n"; }; @@ -33,7 +33,7 @@ mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform editor for VapourSynth scripts"; homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor"; license = licenses.mit; diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix index 119254107e9..dd5b03f2dc5 100644 --- a/pkgs/development/libraries/vc/0.7.nix +++ b/pkgs/development/libraries/vc/0.7.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "Vc"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sed -i '/AutodetectHostArchitecture()/d' print_target_architecture.cmake ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for multiprecision complex arithmetic with exact rounding"; homepage = "https://github.com/VcDevel/Vc"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index d3673e783cd..40347940ff0 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "Vc"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sed -i '/AutodetectHostArchitecture()/d' print_target_architecture.cmake ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for multiprecision complex arithmetic with exact rounding"; homepage = "https://github.com/VcDevel/Vc"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index a8a24750744..380f533fe6f 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, eigen }: +{ lib, stdenv, fetchFromGitHub, eigen }: stdenv.mkDerivation rec { pname = "vcg"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { find $out -name \*.h -exec sed -i 's, doxygen != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "waylandpp"; version = "0.2.8"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Wayland C++ binding"; homepage = "https://github.com/NilsBrause/waylandpp/"; license = with licenses; [ bsd2 hpnd ]; diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 2b3414df1a4..c12118a99de 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, flex }: +{ fetchurl, lib, stdenv, flex }: stdenv.mkDerivation rec { version = "7.3.1"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { systems. This is the standard library for this purpose in astronomy.''; - license = stdenv.lib.licenses.lgpl3Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 0a58e997c22..1abfd3a9194 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , perl , python3 @@ -57,7 +57,7 @@ assert enableGeoLocation -> geoclue2 != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "webkitgtk"; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { ./libglvnd-headers.patch ]; - preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' # Ignore gettext in cmake_prefix_path so that find_program doesn't # pick up the wrong gettext. TODO: Find a better solution for # this, maybe make cmake not look up executables in @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { python3 ruby glib # for gdbus-codegen - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ wayland # for wayland-scanner ]; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 91d93352da1..efd2ce3b1fc 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, darwin }: +{ lib, stdenv, fetchurl, darwin }: stdenv.mkDerivation rec { name = "webrtc-audio-processing-0.3.1"; @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); - patchPhase = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index d04cadb483b..5c9271f2a85 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "websocket++"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.zaphoyd.com/websocketpp/"; description = "C++/Boost Asio based websocket client/server library"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index ea63a73fc92..880823a8473 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, alsaLib, freepats }: +{ lib, stdenv, fetchurl, cmake, alsaLib, freepats }: stdenv.mkDerivation rec { name = "wildmidi-0.4.3"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { echo "source ${freepats}/freepats.cfg" >> "$out"/etc/wildmidi.cfg ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Software MIDI player and library"; longDescription = '' WildMIDI is a simple software midi player which has a core softsynth diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index 9a7cee6623e..7b636e984de 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool +{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool # Optional Dependencies , lz4 ? null, snappy ? null, zlib ? null, bzip2 ? null, db ? null , gperftools ? null, leveldb ? null }: -with stdenv.lib; +with lib; let mkFlag = trueStr: falseStr: cond: name: val: "--" + (if cond then trueStr else falseStr) @@ -14,7 +14,7 @@ let mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; optLz4 = shouldUsePkg lz4; optSnappy = shouldUsePkg snappy; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 13132c8cc1c..a21179e2025 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland , libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa , libpng, ffmpeg @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A modular Wayland compositor library"; longDescription = '' Pluggable, composable, unopinionated modules for building a Wayland diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 30fc90ec8c0..c0c0218a318 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "wolfssl"; @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { mkdir -p "$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A small, fast, portable implementation of TLS/SSL for embedded devices"; homepage = "https://www.wolfssl.com/"; platforms = platforms.all; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ mcmtroffaes ]; }; } diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index de98a11d68e..8887c4410f4 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qt48Full, libharu +{ lib, stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qt48Full, libharu , pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl , pcre, harfbuzz }: @@ -28,16 +28,16 @@ let "-DWT_CPP_11_MODE=-std=c++11" "--no-warn-unused-cli" ] - ++ stdenv.lib.optionals (graphicsmagick != null) [ + ++ lib.optionals (graphicsmagick != null) [ "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" "-DGM_PREFIX=${graphicsmagick}" ] - ++ stdenv.lib.optional (harfbuzz != null) + ++ lib.optional (harfbuzz != null) "-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include" - ++ stdenv.lib.optional (libmysqlclient != null) + ++ lib.optional (libmysqlclient != null) "-DMYSQL_PREFIX=${libmysqlclient}"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.webtoolkit.eu/wt"; description = "C++ library for developing web applications"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index d66a628dac7..9ddc95a9ccc 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, unzip, xorg }: +{ lib, stdenv, requireFile, unzip, xorg }: assert stdenv.hostPlatform.system == "i686-linux"; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://java.sun.com/products/sjwtoolkit/download.html"; description = "Sun Java Wireless Toolkit 2.5.2_01 for CLDC"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 0ababf305c8..5e7f7b71fbe 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pkg-config, wxGTK , ffmpeg_3, libexif , cairo, pango }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo pango ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A SVG manipulation library built with wxWidgets"; longDescription = '' wxSVG is C++ library to create, manipulate and render diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index db5e91b74d6..8acd4e99636 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , wxGTK @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ wxGTK sqlite ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ]; + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://utelle.github.io/wxsqlite3/"; description = "A C++ wrapper around the public domain SQLite 3.x for wxWidgets"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index 18ecea4cbe1..7cf5484bef7 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }: +{ lib, stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }: stdenv.mkDerivation rec { pname = "wxsqliteplus"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { install -D wxsqliteplus $out/bin/wxsqliteplus ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/guanlisheng/wxsqliteplus"; description = "A simple SQLite database browser built with wxWidgets"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 4e0481cc47d..93529ef430f 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto +{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , libX11, cairo -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms -, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, withMesa ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true, }: assert withMesa -> libGLU != null && libGL != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "2.8.12.1"; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index d1b0d56576b..358b45fbf0c 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto +{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , setfile -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms -, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, withMesa ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null @@ -9,7 +9,7 @@ assert withMesa -> libGLU != null && libGL != null; -with stdenv.lib; +with lib; let version = "2.9.4"; diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index e77b0097d47..c97a9778d5d 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, fetchurl, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchurl, pkg-config , libXinerama, libSM, libXxf86vm , gtk2, gtk3 , xorgproto, gst_all_1, setfile -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported , libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true @@ -11,7 +11,7 @@ , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: -with stdenv.lib; +with lib; assert withMesa -> libGLU != null && libGL != null; assert withWebKit -> webkitgtk != null; diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index a6973f53de8..22e81840991 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib +{ lib, stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib # darwin only attributes , derez, rez, setfile , AGL, Cocoa, Kernel, WebKit @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { platforms = platforms.darwin; license = licenses.wxWindows; maintainers = [ maintainers.lnl7 ]; diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index a75b5c1270b..cbacf4ec762 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchurl , pkg-config @@ -12,7 +12,7 @@ , xorgproto , gst_all_1 , setfile -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported , libGLU ? null , libGL ? null @@ -29,7 +29,7 @@ , QTKit ? null }: -with stdenv.lib; +with lib; assert withMesa -> libGLU != null && libGL != null; assert withWebKit -> webkitgtk != null; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 49797b5dd75..93d0b42a889 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "--enable-shared" ] - ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic" - ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}"; + ++ lib.optional (!stdenv.isi686) "--enable-pic" + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}"; nativeBuildInputs = lib.optional (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isi686) nasm; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for encoding H264/AVC video streams"; homepage = "http://www.videolan.org/developers/x264.html"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 8c5cf32545c..495bbc4aaab 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, cmake, nasm, numactl +{ lib, stdenv, fetchFromBitbucket, cmake, nasm, numactl , numaSupport ? stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) # Enabled by default on NUMA platforms , debugSupport ? false # Run-time sanity checks (debugging) , werrorSupport ? false # Warnings as errors @@ -21,7 +21,7 @@ let (mkFlag custatsSupport "DETAILED_CU_STATS") (mkFlag unittestsSupport "ENABLE_TESTS") (mkFlag werrorSupport "WARNINGS_AS_ERRORS") - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isPower [ + ] ++ lib.optionals stdenv.hostPlatform.isPower [ "-DENABLE_ALTIVEC=OFF" ]; @@ -56,7 +56,7 @@ let cd source ''; - nativeBuildInputs = [cmake nasm] ++ stdenv.lib.optional numaSupport numactl; + nativeBuildInputs = [cmake nasm] ++ lib.optional numaSupport numactl; }; libx265-10 = buildLib false; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { "-DENABLE_SHARED=ON" "-DHIGH_BIT_DEPTH=OFF" "-DENABLE_HDR10_PLUS=OFF" - ] ++ stdenv.lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [ + ] ++ lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [ "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a" "-DLINKED_10BIT=ON" "-DLINKED_12BIT=ON" @@ -92,9 +92,9 @@ stdenv.mkDerivation rec { rm $out/lib/*.a ''; - nativeBuildInputs = [ cmake nasm ] ++ stdenv.lib.optional numaSupport numactl; + nativeBuildInputs = [ cmake nasm ] ++ lib.optional numaSupport numactl; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for encoding h.265/HEVC video streams"; homepage = "http://x265.org"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix index 30ab7f4496d..242788723fb 100644 --- a/pkgs/development/libraries/xalanc/default.nix +++ b/pkgs/development/libraries/xalanc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xercesc, getopt }: +{ lib, stdenv, fetchurl, xercesc, getopt }: let platform = if stdenv.isLinux then "linux" else @@ -25,8 +25,8 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://xalan.apache.org/"; description = "A XSLT processor for transforming XML documents"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = [ lib.maintainers.jagajaga ]; }; } diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 195aea5c2f1..cfca33a62d2 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook +{ lib, stdenv, fetchurl, autoreconfHook , libuuid, zlib }: let @@ -20,16 +20,16 @@ let doCheck = true; AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git - patches = stdenv.lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; # the configure script thinks that Darwin has ___exp10 # but it’s not available on my systems (or hydra apparently) - postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.isDarwin '' substituteInPlace config.h \ --replace "#define HAVE___EXP10 1" "#undef HAVE___EXP10" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Search engine library"; homepage = "https://xapian.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index 6028982d987..79e5786f048 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, xapian, perl, pcre, zlib, libmagic }: +{ lib, stdenv, fetchurl, pkg-config, xapian, perl, pcre, zlib, libmagic }: stdenv.mkDerivation rec { pname = "xapian-omega"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ xapian perl pcre zlib libmagic ]; nativeBuildInputs = [ pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Indexer and CGI search front-end built on Xapian library"; homepage = "https://xapian.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix index 18b10376315..11d73a9decb 100644 --- a/pkgs/development/libraries/xavs/default.nix +++ b/pkgs/development/libraries/xavs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn }: +{ lib, stdenv, fetchsvn }: stdenv.mkDerivation rec { pname = "xavs"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchShebangs tools/patcheck patchShebangs tools/regression-test.pl patchShebangs tools/xavs-format - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace config.guess --replace 'uname -p' 'uname -m' substituteInPlace configure \ --replace '-O4' '-O3' \ @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "--disable-asm" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "AVS encoder and decoder"; homepage = "http://xavs.sourceforge.net/"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix index ae7ceb18c0a..db36c2a34c1 100644 --- a/pkgs/development/libraries/xbase/default.nix +++ b/pkgs/development/libraries/xbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "xbase-3.1.2"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { }) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://linux.techass.com/projects/xdb/"; description = "C++ class library formerly known as XDB"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/development/libraries/xcb-imdkit/default.nix index 72ce94d98f1..8a13738a7e0 100644 --- a/pkgs/development/libraries/xcb-imdkit/default.nix +++ b/pkgs/development/libraries/xcb-imdkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , extra-cmake-modules @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { xcbutilkeysyms ]; - meta = with stdenv.lib; { + meta = with lib; { description = "input method development support for xcb"; homepage = "https://github.com/fcitx/xcb-imdkit"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 2cdf8850e2d..f296f59d408 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, pkg-config +{ lib, stdenv, fetchgit, autoconf, automake, libtool, pkg-config , xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "127zfmihd8nqlj8jjaja06xb84xdgl263w0av1xnprx05mkbkcyc"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "XCB cursor library (libxcursor port)"; homepage = "https://cgit.freedesktop.org/xcb/util-cursor"; license = licenses.mit; diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix index 0ad18ff70d4..21d6b6fa73e 100644 --- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , libxslt @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "DBus proxy for Flatpak and others"; homepage = "https://github.com/flatpak/xdg-dbus-proxy"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index b7e58948553..be96001c46f 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkg-config @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { gnome3.gnome-settings-daemon # schemas needed for settings api (fonts, etc) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop integration portals for sandboxed apps"; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index 16f9e7edb69..151c74f0b70 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, wayland-protocols , pipewire, wayland, elogind, systemd, libdrm }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ]; buildInputs = [ pipewire wayland elogind systemd libdrm ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/emersion/xdg-desktop-portal-wlr"; description = "xdg-desktop-portal backend for wlroots"; maintainers = with maintainers; [ minijackson ]; diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 52f089126a9..cab35852831 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nixosTests , substituteAll @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Desktop integration portals for sandboxed apps"; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; diff --git a/pkgs/development/libraries/xed/default.nix b/pkgs/development/libraries/xed/default.nix index 1d6dcdc67ad..395b399d8fe 100644 --- a/pkgs/development/libraries/xed/default.nix +++ b/pkgs/development/libraries/xed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: let # mbuild is a custom build system used only to build xed @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { dontInstall = true; # already installed during buildPhase - meta = with stdenv.lib; { + meta = with lib; { description = "Intel X86 Encoder Decoder (Intel XED)"; homepage = "https://intelxed.github.io/"; license = licenses.apsl20; diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index 8c7b1232014..dec42c0243e 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "xerces-c"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://xerces.apache.org/xerces-c/"; description = "Validating XML parser written in a portable subset of C++"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.asl20; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index b9a2820a928..973e7dc028e 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { install -Dm755 ../xgboost $out/bin/xgboost ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index f5aa4f397ab..cbdc1a2dcf0 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkg-config, xorg, alsaLib, libGLU, libGL, aalib +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, xorg, alsaLib, libGLU, libGL, aalib , libvorbis, libtheora, speex, zlib, perl, ffmpeg_3 , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager , libmpcdec @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.xine-project.org/"; description = "A high-performance, portable and reusable multimedia playback engine"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix index 049c54d792b..735cc278deb 100644 --- a/pkgs/development/libraries/xlibs-wrapper/default.nix +++ b/pkgs/development/libraries/xlibs-wrapper/default.nix @@ -1,4 +1,4 @@ -{stdenv, packages}: +{lib, stdenv, packages}: stdenv.mkDerivation { name = "xlibs-wrapper"; @@ -16,6 +16,6 @@ stdenv.mkDerivation { buildClientLibs = true; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index ee3942c360b..77a11b53110 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, unzip }: +{ lib, stdenv, fetchurl, autoreconfHook, unzip }: stdenv.mkDerivation rec { pname = "xlslib"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "C++/C library to construct Excel .xls files in code"; homepage = "https://sourceforge.net/projects/xlslib/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index eb09b0e0859..7548a45e5d4 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xalanc, xercesc, openssl, pkg-config }: +{ lib, stdenv, fetchurl, xalanc, xercesc, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "xml-security-c"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://santuario.apache.org/"; description = "C++ Implementation of W3C security standards for XML"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.jagajaga ]; }; } diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index 8671c124ab2..9cf3ddb9219 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkg-config +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config , boost, curl, openssl, log4shib, xercesc, xml-security-c }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A low-level library that provides a high level interface to XML processing for OpenSAML 2"; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index 41cdbf0b4f1..7b6907a0162 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, curl, libxml2 }: +{ lib, stdenv, fetchurl, curl, libxml2 }: stdenv.mkDerivation rec { name = "xmlrpc-c-1.51.06"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight RPC library based on XML and HTTP"; homepage = "http://xmlrpc-c.sourceforge.net/"; # /doc/COPYING also lists "Expat license", diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index f45979b847e..8bf98760950 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { patches = [ ./lt_dladdsearchdir.patch - ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ]; + ] ++ lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ]; postPatch = '' substituteAllInPlace src/dl.c ''; @@ -76,8 +76,8 @@ stdenv.mkDerivation { homepage = "http://www.aleksey.com/xmlsec"; downloadPage = "https://www.aleksey.com/xmlsec/download.html"; description = "XML Security Library in C based on libxml2"; - license = stdenv.lib.licenses.mit; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.mit; + platforms = with lib.platforms; linux ++ darwin; updateWalker = true; }; } diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix index 3388666f46b..2d614ee0e73 100644 --- a/pkgs/development/libraries/xsd/default.nix +++ b/pkgs/development/libraries/xsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xercesc }: +{ lib, stdenv, fetchurl, xercesc }: let in @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.codesynthesis.com/products/xsd"; description = "An open-source, cross-platform W3C XML Schema to C++ data binding compiler"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.jagajaga ]; }; } diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index ab68693ea5e..dbc3d837a45 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, yasm, autoconf, automake, libtool }: +{ lib, stdenv, fetchurl, yasm, autoconf, automake, libtool }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "xvidcore"; version = "1.3.5"; diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index a5e6bfb11a6..fbeadc2b353 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "xxHash"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # Upstream Makefile does not anticipate that user may not want to # build .so library. - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isStatic '' + postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' sed -i 's/lib: libxxhash.a libxxhash/lib: libxxhash.a/' Makefile sed -i '/LIBXXH) $(DESTDIR/ d' Makefile ''; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(dev)" "EXEC_PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extremely fast hash algorithm"; longDescription = '' xxHash is an Extremely fast Hash algorithm, running at RAM speed limits. diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix index 2b4cb1d56da..f7d7eed7e70 100644 --- a/pkgs/development/libraries/xylib/default.nix +++ b/pkgs/development/libraries/xylib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }: +{ lib, stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }: stdenv.mkDerivation rec { pname = "xylib"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost zlib bzip2 wxGTK30 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods"; license = licenses.lgpl21; homepage = "http://xylib.sourceforge.net/"; diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index 62fe652724f..df47168c79b 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { name = "yajl-2.1.0"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { C, and a small validating JSON generator. ''; homepage = "http://lloyd.github.com/yajl/"; - license = stdenv.lib.licenses.isc; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ maggesi ]; + license = lib.licenses.isc; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ maggesi ]; }; } diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix index 9e6cc37e661..b72820c77a6 100644 --- a/pkgs/development/libraries/yojimbo/default.nix +++ b/pkgs/development/libraries/yojimbo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }: +{ lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }: stdenv.mkDerivation { pname = "yojimbo"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A network library for client/server games with dedicated servers"; longDescription = '' yojimbo is a network library for client/server games with dedicated servers. diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix index bfe09b0e94c..1289b03618c 100644 --- a/pkgs/development/libraries/yubico-pam/default.nix +++ b/pkgs/development/libraries/yubico-pam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , asciidoc, libxslt, docbook_xsl , pam, yubikey-personalization, libyubikey, libykclient }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config asciidoc libxslt docbook_xsl ]; buildInputs = [ pam yubikey-personalization libyubikey libykclient ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Yubico PAM module"; homepage = "https://developers.yubico.com/yubico-pam"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index 67d4320b898..a0d1378aa70 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , pkg-config @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ zstd curl - ] ++ stdenv.lib.optional stdenv.isDarwin argp-standalone; + ] ++ lib.optional stdenv.isDarwin argp-standalone; # Darwin needs a patch for argp-standalone usage and differing endian.h location on macOS # https://github.com/zchunk/zchunk/pull/35 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "File format designed for highly efficient deltas while maintaining good compression"; homepage = "https://github.com/zchunk/zchunk"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 37ab1b1ec47..039ecc610f4 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , fetchpatch , pkg-config @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "zeitgeist"; version = "1.0.2"; - outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional pythonSupport "py"; + outputs = [ "out" "lib" "dev" "man" ] ++ lib.optional pythonSupport "py"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -75,11 +75,11 @@ stdenv.mkDerivation rec { NOCONFIGURE=1 ./autogen.sh ''; - postFixup = stdenv.lib.optionalString pythonSupport '' + postFixup = lib.optionalString pythonSupport '' moveToOutput lib/${python3.libPrefix} "$py" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A service which logs the users’s activities and events"; homepage = "https://zeitgeist.freedesktop.org/"; maintainers = with maintainers; [ lethalman worldofpeace ]; diff --git a/pkgs/development/libraries/zeroc-ice/3.6.nix b/pkgs/development/libraries/zeroc-ice/3.6.nix index 7f6c7323fff..896973e32eb 100644 --- a/pkgs/development/libraries/zeroc-ice/3.6.nix +++ b/pkgs/development/libraries/zeroc-ice/3.6.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { rm -rf $out/share/slice ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.zeroc.com/ice.html"; description = "The internet communications engine"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 2fb36c0aea5..ef16e381bcf 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { mv $out/share/ice $dev/share ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.zeroc.com/ice.html"; description = "The internet communications engine"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 7be5a74c3a4..a3c35d123b6 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium , enableDrafts ? false }: stdenv.mkDerivation rec { @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { doCheck = false; # fails all the tests (ctest) - cmakeFlags = stdenv.lib.optional enableDrafts "-DENABLE_DRAFTS=ON"; + cmakeFlags = lib.optional enableDrafts "-DENABLE_DRAFTS=ON"; - meta = with stdenv.lib; { + meta = with lib; { branch = "4"; homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index afb13a03cbb..56ced97653e 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "zimg"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Scaling, colorspace conversion and dithering library"; homepage = "https://github.com/sekrit-twc/zimg"; license = licenses.wtfpl; diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix index 7f5168080fa..6dc998cd0e2 100644 --- a/pkgs/development/libraries/zimlib/default.nix +++ b/pkgs/development/libraries/zimlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lzma }: +{ lib, stdenv, fetchurl, lzma }: stdenv.mkDerivation rec { pname = "zimlib"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for reading and writing ZIM files"; homepage = "https://www.openzim.org/wiki/Zimlib"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index b780fcda393..da8aac5229b 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , shared ? !stdenv.hostPlatform.isStatic , static ? true @@ -33,9 +33,9 @@ stdenv.mkDerivation (rec { sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"; }; - patches = stdenv.lib.optional stdenv.hostPlatform.isCygwin ./disable-cygwin-widechar.patch; + patches = lib.optional stdenv.hostPlatform.isCygwin ./disable-cygwin-widechar.patch; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure \ --replace '/usr/bin/libtool' 'ar' \ --replace 'AR="libtool"' 'AR="ar"' \ @@ -43,7 +43,7 @@ stdenv.mkDerivation (rec { ''; outputs = [ "out" "dev" ] - ++ stdenv.lib.optional splitStaticOutput "static"; + ++ lib.optional splitStaticOutput "static"; setOutputFlags = false; outputDoc = "dev"; # single tiny man3 page @@ -60,8 +60,8 @@ stdenv.mkDerivation (rec { # Of these, we choose `--shared`, only because that's # what we did in the past and we can avoid mass rebuilds this way. # As a result, we pass `--static` only when we want just static. - configureFlags = stdenv.lib.optional (static && !shared) "--static" - ++ stdenv.lib.optional shared "--shared"; + configureFlags = lib.optional (static && !shared) "--static" + ++ lib.optional shared "--shared"; # Note we don't need to set `dontDisableStatic`, because static-disabling # works by grepping for `enable-static` in the `./configure` script @@ -71,33 +71,33 @@ stdenv.mkDerivation (rec { # here (in case zlib ever switches to autoconf in the future), # but we don't do it simply to avoid mass rebuilds. - postInstall = stdenv.lib.optionalString splitStaticOutput '' + postInstall = lib.optionalString splitStaticOutput '' moveToOutput lib/libz.a "$static" '' # jww (2015-01-06): Sometimes this library install as a .so, even on # Darwin; others time it installs as a .dylib. I haven't yet figured out # what causes this difference. - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' for file in $out/lib/*.so* $out/lib/*.dylib* ; do ${stdenv.cc.bintools.targetPrefix}install_name_tool -id "$file" $file done '' # Non-typical naming confuses libtool which then refuses to use zlib's DLL # in some cases, e.g. when compiling libpng. - + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") '' + + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") '' ln -s zlib1.dll $out/bin/libz.dll ''; # As zlib takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) "-static-libgcc"; + NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-static-libgcc"; # We don't strip on static cross-compilation because of reports that native # stripping corrupted the target library; see commit 12e960f5 for the report. dontStrip = stdenv.hostPlatform != stdenv.buildPlatform && static; configurePlatforms = []; - installFlags = stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ + installFlags = lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ "BINARY_PATH=$(out)/bin" "INCLUDE_PATH=$(dev)/include" "LIBRARY_PATH=$(out)/lib" @@ -108,9 +108,9 @@ stdenv.mkDerivation (rec { makeFlags = [ "PREFIX=${stdenv.cc.targetPrefix}" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ + ] ++ lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ "-f" "win32/Makefile.gcc" - ] ++ stdenv.lib.optionals shared [ + ] ++ lib.optionals shared [ # Note that as of writing (zlib 1.2.11), this flag only has an effect # for Windows as it is specific to `win32/Makefile.gcc`. "SHARED_MODE=1" @@ -120,16 +120,16 @@ stdenv.mkDerivation (rec { inherit version; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://zlib.net"; description = "Lossless data-compression library"; license = licenses.zlib; platforms = platforms.all; }; -} // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { +} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { preConfigure = '' export CHOST=${stdenv.hostPlatform.config} ''; -} // stdenv.lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") { +} // lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") { dontConfigure = true; }) diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index f0ca99b7667..b115cf7b675 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "1.2.15"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library"; homepage = "https://hardysimpson.github.io/zlog/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/development/libraries/zmqpp/default.nix index 0a7438fbc32..733573b3e23 100644 --- a/pkgs/development/libraries/zmqpp/default.nix +++ b/pkgs/development/libraries/zmqpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, zeromq }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zeromq }: stdenv.mkDerivation rec { pname = "zmqpp"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zeromq ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix index ea786d770eb..978321f96e7 100644 --- a/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/pkgs/development/libraries/zookeeper_mt/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoreconfHook , jre @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "zookeeper_mt"; - version = stdenv.lib.getVersion zookeeper; + version = lib.getVersion zookeeper; src = fetchurl { url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { "--without-cppunit" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://zookeeper.apache.org"; description = "Apache Zookeeper"; license = licenses.asl20; diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix index 7a524e72318..e74bb9ddc32 100644 --- a/pkgs/development/libraries/zxcvbn-c/default.nix +++ b/pkgs/development/libraries/zxcvbn-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "zxcvbn-c"; version = "2.4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { install -D -t $out/lib libzxcvbn.so* ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tsyrogit/zxcvbn-c"; description = "A C/C++ implementation of the zxcvbn password strength estimation"; license = licenses.mit; diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 228dfdcf77a..8cfec83af54 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , perl , pkg-config , fetchFromGitHub @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { doCheck = false; checkTarget = "check"; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to extract data from files archived in a zip file"; longDescription = '' -- cgit 1.4.1 From 0b214e095677f91b7f00f1217277f4540c3427d1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 31 Jan 2021 09:50:00 -0500 Subject: libuv: disable tcp_connect_timeout test The test relies on connection to 8.8.8.8 port 9999 to hang. In sandboxed build it is skipped anyway: ok 270 - tcp_connect_timeout # SKIP Network unreachable. --- pkgs/development/libraries/libuv/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries/libuv/default.nix') diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index a4447ed3378..f064a7b82c2 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { postPatch = let toDisable = [ "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent + "tcp_connect_timeout" # tries to reach out to 8.8.8.8 "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces "getaddrinfo_fail" "getaddrinfo_fail_sync" "threadpool_multiple_event_loops" # times out on slow machines -- cgit 1.4.1 From 2d6909d4168fcfc832f122a44d8304fe3674fdab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Feb 2021 01:34:39 +0000 Subject: libuv: 1.40.0 -> 1.41.0 --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/libuv/default.nix') diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index a4447ed3378..0a092ab0be5 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.40.0"; + version = "1.41.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1hd0x6i80ca3j0c3a7laygzab5qkgxjkz692jwzrsinsfhvbq0pg"; + sha256 = "sha256-i6AYD1Ony0L2+3yWK6bxOfwoZEvd9qCg33QSqA7bRXI="; }; postPatch = let -- cgit 1.4.1 From 742b8f71f7e101bf3ecd48f28af9eda67591339e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 5 Jul 2021 21:15:43 +0200 Subject: libuv: add patch for CVE-2021-22918 > libuv was vulnerable to out-of-bounds reads in the uv__idna_toascii() > function which is used to convert strings to ASCII. This is called by > the DNS resolution function and can lead to information disclosures or > crashes. https://github.com/libuv/libuv/commit/b7466e31e4bee160d82a68fca11b1f61d46debae Fixes: CVE-2021-22918 --- pkgs/development/libraries/libuv/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries/libuv/default.nix') diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 6b1a0120e49..b630fca1670 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { version = "1.41.0"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-i6AYD1Ony0L2+3yWK6bxOfwoZEvd9qCg33QSqA7bRXI="; }; + patches = [ + (fetchpatch { + # Fixes out-of-bounds read in uv__idna_toascii() function + name = "CVE-2021-22918.patch"; + url = "https://github.com/libuv/libuv/commit/b7466e31e4bee160d82a68fca11b1f61d46debae.patch"; + sha256 = "0fbjy0jh7r9nrd27ag1k6am6d8p5ih7p0ywvjn53nq4cyqdqxhi7"; + }) + ]; + postPatch = let toDisable = [ "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent -- cgit 1.4.1