b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #192851 from Artturin/treewides1

Browse source
This commit is contained in:
Artturi 2022-09-28 00:50:06 +03:00 committed by GitHub
parent 8d941befdb 0734f54ef2
commit 1c1c182814
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
145 changed files with 256 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
maintainers/scripts/nix-generate-from-cpan.nix
View file

@ -3,8 +3,10 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nix-generate-from-cpan-3"; name = "nix-generate-from-cpan-3";
nativeBuildInputs = [ makeWrapper ];
buildInputs = with perlPackages; [ buildInputs = with perlPackages; [
makeWrapper perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl
]; ];
phases = [ "installPhase" ]; phases = [ "installPhase" ];

4
nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix
View file

@ -23,8 +23,10 @@ in
runCommand "uvcdynctrl-udev-rules-${version}" runCommand "uvcdynctrl-udev-rules-${version}"
{ {
inherit dataPath; inherit dataPath;
buildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
];
buildInputs = [
libwebcam libwebcam
]; ];
dontPatchELF = true; dontPatchELF = true;

2
nixos/modules/programs/mininet.nix
View file

@ -14,7 +14,7 @@ let
pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]); pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]);
mnexecWrapped = pkgs.runCommand "mnexec-wrapper" mnexecWrapped = pkgs.runCommand "mnexec-wrapper"
{ buildInputs = [ pkgs.makeWrapper pkgs.pythonPackages.wrapPython ]; } { nativeBuildInputs = [ pkgs.makeWrapper pkgs.pythonPackages.wrapPython ]; }
'' ''
makeWrapper ${pkgs.mininet}/bin/mnexec \ makeWrapper ${pkgs.mininet}/bin/mnexec \
$out/bin/mnexec \ $out/bin/mnexec \

2
nixos/modules/services/audio/mopidy.nix
View file

@ -14,7 +14,7 @@ let
name = "mopidy-with-extensions-${mopidy.version}"; name = "mopidy-with-extensions-${mopidy.version}";
paths = closePropagation cfg.extensionPackages; paths = closePropagation cfg.extensionPackages;
pathsToLink = [ "/${mopidyPackages.python.sitePackages}" ]; pathsToLink = [ "/${mopidyPackages.python.sitePackages}" ];
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
postBuild = '' postBuild = ''
makeWrapper ${mopidy}/bin/mopidy $out/bin/mopidy \ makeWrapper ${mopidy}/bin/mopidy $out/bin/mopidy \
--prefix PYTHONPATH : $out/${mopidyPackages.python.sitePackages} --prefix PYTHONPATH : $out/${mopidyPackages.python.sitePackages}

2
nixos/modules/services/backup/borgbackup.nix
View file

@ -116,7 +116,7 @@ let
original, name, set ? {} original, name, set ? {}
}: }:
pkgs.runCommand "${name}-wrapper" { pkgs.runCommand "${name}-wrapper" {
buildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
} (with lib; '' } (with lib; ''
makeWrapper "${original}" "$out/bin/${name}" \ makeWrapper "${original}" "$out/bin/${name}" \
${concatStringsSep " \\\n " (mapAttrsToList (name: value: ''--set ${name} "${value}"'') set)} ${concatStringsSep " \\\n " (mapAttrsToList (name: value: ''--set ${name} "${value}"'') set)}

2
nixos/modules/services/continuous-integration/hydra/default.nix
View file

@ -42,7 +42,7 @@ let
makeWrapperArgs = concatStringsSep " " (mapAttrsToList (key: value: "--set \"${key}\" \"${value}\"") hydraEnv); makeWrapperArgs = concatStringsSep " " (mapAttrsToList (key: value: "--set \"${key}\" \"${value}\"") hydraEnv);
in pkgs.buildEnv rec { in pkgs.buildEnv rec {
name = "hydra-env"; name = "hydra-env";
buildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
paths = [ cfg.package ]; paths = [ cfg.package ];
postBuild = '' postBuild = ''

2
nixos/modules/services/misc/etebase-server.nix
View file

@ -162,7 +162,7 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(runCommand "etebase-server" { (runCommand "etebase-server" {
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
} '' } ''
makeWrapper ${pythonEnv}/bin/etebase-server \ makeWrapper ${pythonEnv}/bin/etebase-server \
$out/bin/etebase-server \ $out/bin/etebase-server \

4
nixos/modules/services/misc/gitlab.nix
View file

@ -190,7 +190,7 @@ let
gitlab-rake = pkgs.stdenv.mkDerivation { gitlab-rake = pkgs.stdenv.mkDerivation {
name = "gitlab-rake"; name = "gitlab-rake";
buildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
dontBuild = true; dontBuild = true;
dontUnpack = true; dontUnpack = true;
installPhase = '' installPhase = ''
@ -205,7 +205,7 @@ let
gitlab-rails = pkgs.stdenv.mkDerivation { gitlab-rails = pkgs.stdenv.mkDerivation {
name = "gitlab-rails"; name = "gitlab-rails";
buildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
dontBuild = true; dontBuild = true;
dontUnpack = true; dontUnpack = true;
installPhase = '' installPhase = ''

2
nixos/modules/services/networking/knot.nix
View file

@ -18,7 +18,7 @@ let
knot-cli-wrappers = pkgs.stdenv.mkDerivation { knot-cli-wrappers = pkgs.stdenv.mkDerivation {
name = "knot-cli-wrappers"; name = "knot-cli-wrappers";
buildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
buildCommand = '' buildCommand = ''
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper ${cfg.package}/bin/knotc "$out/bin/knotc" \ makeWrapper ${cfg.package}/bin/knotc "$out/bin/knotc" \

2
nixos/modules/services/networking/pptpd.nix
View file

@ -82,7 +82,7 @@ with lib;
ppp-pptpd-wrapped = pkgs.stdenv.mkDerivation { ppp-pptpd-wrapped = pkgs.stdenv.mkDerivation {
name = "ppp-pptpd-wrapped"; name = "ppp-pptpd-wrapped";
phases = [ "installPhase" ]; phases = [ "installPhase" ];
buildInputs = with pkgs; [ makeWrapper ]; nativeBuildInputs = with pkgs; [ makeWrapper ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper ${pkgs.ppp}/bin/pppd $out/bin/pppd \ makeWrapper ${pkgs.ppp}/bin/pppd $out/bin/pppd \

2
nixos/modules/services/networking/tinc.nix
View file

@ -410,7 +410,7 @@ in
environment.systemPackages = let environment.systemPackages = let
cli-wrappers = pkgs.stdenv.mkDerivation { cli-wrappers = pkgs.stdenv.mkDerivation {
name = "tinc-cli-wrappers"; name = "tinc-cli-wrappers";
buildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
buildCommand = '' buildCommand = ''
mkdir -p $out/bin mkdir -p $out/bin
${concatStringsSep "\n" (mapAttrsToList (network: data: ${concatStringsSep "\n" (mapAttrsToList (network: data:

2
nixos/modules/services/networking/xl2tpd.nix
View file

@ -84,7 +84,7 @@ with lib;
xl2tpd-ppp-wrapped = pkgs.stdenv.mkDerivation { xl2tpd-ppp-wrapped = pkgs.stdenv.mkDerivation {
name = "xl2tpd-ppp-wrapped"; name = "xl2tpd-ppp-wrapped";
phases = [ "installPhase" ]; phases = [ "installPhase" ];
buildInputs = with pkgs; [ makeWrapper ]; nativeBuildInputs = with pkgs; [ makeWrapper ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin

2
nixos/modules/services/web-apps/mediawiki.nix
View file

@ -35,7 +35,7 @@ let
}; };
mediawikiScripts = pkgs.runCommand "mediawiki-scripts" { mediawikiScripts = pkgs.runCommand "mediawiki-scripts" {
buildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
preferLocalBuild = true; preferLocalBuild = true;
} '' } ''
mkdir -p $out/bin mkdir -p $out/bin

2
nixos/modules/virtualisation/azure-agent.nix
View file

@ -17,7 +17,7 @@ let
patches = [ ./azure-agent-entropy.patch ]; patches = [ ./azure-agent-entropy.patch ];
buildInputs = [ makeWrapper python pythonPackages.wrapPython ]; nativeBuildInputs = [ makeWrapper python pythonPackages.wrapPython ];
runtimeDeps = [ findutils gnugrep gawk coreutils openssl openssh runtimeDeps = [ findutils gnugrep gawk coreutils openssl openssh
nettools # for hostname nettools # for hostname
procps # for pidof procps # for pidof

2
nixos/tests/hydra/common.nix
View file

@ -16,7 +16,7 @@
createTrivialProject = pkgs.stdenv.mkDerivation { createTrivialProject = pkgs.stdenv.mkDerivation {
name = "create-trivial-project"; name = "create-trivial-project";
dontUnpack = true; dontUnpack = true;
buildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh";
postFixup = '' postFixup = ''
wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob} wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob}

2
nixos/tests/kubernetes/base.nix
View file

@ -18,7 +18,7 @@ let
${master.ip} api.${domain} ${master.ip} api.${domain}
${concatMapStringsSep "\n" (machineName: "${machines.${machineName}.ip} ${machineName}.${domain}") (attrNames machines)} ${concatMapStringsSep "\n" (machineName: "${machines.${machineName}.ip} ${machineName}.${domain}") (attrNames machines)}
''; '';
wrapKubectl = with pkgs; runCommand "wrap-kubectl" { buildInputs = [ makeWrapper ]; } '' wrapKubectl = with pkgs; runCommand "wrap-kubectl" { nativeBuildInputs = [ makeWrapper ]; } ''
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl --set KUBECONFIG "/etc/kubernetes/cluster-admin.kubeconfig" makeWrapper ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl --set KUBECONFIG "/etc/kubernetes/cluster-admin.kubeconfig"
''; '';

3
pkgs/applications/audio/aumix/default.nix
View file

@ -28,8 +28,9 @@ stdenv.mkDerivation rec {
}) })
]; ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gettext ncurses ] buildInputs = [ gettext ncurses ]
++ lib.optionals gtkGUI [ pkg-config gtk2 ]; ++ lib.optionals gtkGUI [ gtk2 ];
meta = with lib; { meta = with lib; {
description = "Audio mixer for X and the console"; description = "Audio mixer for X and the console";

3
pkgs/applications/audio/calf/default.nix
View file

@ -12,9 +12,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH
libglade lv2 pkg-config libglade lv2
]; ];
meta = with lib; { meta = with lib; {

2
pkgs/applications/audio/grandorgue/default.nix
View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ pkg-config fftwFloat alsa-lib zlib wavpack wxGTK31 udev ] buildInputs = [ fftwFloat alsa-lib zlib wavpack wxGTK31 udev ]
++ lib.optional jackaudioSupport libjack2; ++ lib.optional jackaudioSupport libjack2;
cmakeFlags = lib.optional (!jackaudioSupport) [ cmakeFlags = lib.optional (!jackaudioSupport) [

3
pkgs/applications/audio/ltc-tools/default.nix
View file

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0vp25b970r1hv5ndzs4di63rgwnl31jfaj3jz5dka276kx34q4al"; sha256 = "0vp25b970r1hv5ndzs4di63rgwnl31jfaj3jz5dka276kx34q4al";
}; };
buildInputs = [ pkg-config libltc libsndfile jack2 ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ libltc libsndfile jack2 ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];

3
pkgs/applications/audio/meterbridge/default.nix
View file

@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch]; patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch];
nativeBuildInputs = [ pkg-config ];
buildInputs = buildInputs =
[ pkg-config SDL SDL_image libjack2 [ SDL SDL_image libjack2
]; ];
meta = with lib; { meta = with lib; {

3
pkgs/applications/audio/mod-arpeggiator-lv2/default.nix
View file

@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-1KiWMTVTTf1/iR4AzJ1Oe0mOrWN5edsZN0tQMidgnRA="; sha256 = "sha256-1KiWMTVTTf1/iR4AzJ1Oe0mOrWN5edsZN0tQMidgnRA=";
}; };
buildInputs = [ lv2 pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ lv2 ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];

2
pkgs/applications/audio/patchage/default.nix
View file

@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
alsa-lib alsa-lib
boost boost
@ -33,7 +34,6 @@ stdenv.mkDerivation rec {
glibmm glibmm
gtkmm2 gtkmm2
libjack2 libjack2
pkg-config
python3 python3
wafHook wafHook
]; ];

3
pkgs/applications/audio/transcode/default.nix
View file

@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92"; sha256 = "1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92";
}; };
nativeBuildInputs = [ pkg-config ];
buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo
libdvdread pkg-config x264 libmpeg2 xvidcore ]; libdvdread x264 libmpeg2 xvidcore ];
configureFlags = [ configureFlags = [
"--disable-ffmpeg" "--disable-libavcodec" "--disable-libavformat" "--disable-ffmpeg" "--disable-libavcodec" "--disable-libavformat"
"--enable-lzo" "--enable-ogg" "--enable-vorbis" "--enable-theora" "--enable-libxml2" "--enable-lzo" "--enable-ogg" "--enable-vorbis" "--enable-theora" "--enable-libxml2"

4
pkgs/applications/audio/xsynth-dssi/default.nix
View file

@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk";
}; };
nativeBuildInputs = [ autoconf automake ]; nativeBuildInputs = [ autoconf automake pkg-config ];
buildInputs = [ alsa-lib dssi gtk2 libjack2 ladspaH buildInputs = [ alsa-lib dssi gtk2 libjack2 ladspaH
ladspaPlugins liblo pkg-config ]; ladspaPlugins liblo ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin

4
pkgs/applications/editors/leafpad/default.nix
View file

@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ intltool gtk2 ]; buildInputs = [ gtk2 ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

3
pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix
View file

@ -45,7 +45,8 @@ let
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;
}).nodeDependencies.override (old: { }).nodeDependencies.override (old: {
inherit src version; inherit src version;
buildInputs = [pkg-config libsecret]; nativeBuildInputs = [ pkg-config ];
buildInputs = [libsecret];
dontNpmInstall = true; dontNpmInstall = true;
})); }));

4
pkgs/applications/file-managers/spacefm/default.nix
View file

@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
''; '';
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ buildInputs = [
gtk3 udev desktop-file-utils shared-mime-info intltool gtk3 udev desktop-file-utils shared-mime-info
wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2 wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2
] ++ (if ifuseSupport then [ ifuse ] else []); ] ++ (if ifuseSupport then [ ifuse ] else []);
# Introduced because ifuse doesn't build due to CVEs in libplist # Introduced because ifuse doesn't build due to CVEs in libplist

4
pkgs/applications/file-managers/xfe/default.nix
View file

@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1"; sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ fox gettext xlibsWrapper gcc intltool file libpng ]; buildInputs = [ fox gettext xlibsWrapper gcc file libpng ];
preConfigure = '' preConfigure = ''
sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h

4
pkgs/applications/graphics/gpicview/default.nix
View file

@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
}) })
]; ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ intltool gtk2 ]; buildInputs = [ gtk2 ];
meta = with lib; { meta = with lib; {
description = "A simple and fast image viewer for X"; description = "A simple and fast image viewer for X";

1
pkgs/applications/graphics/synfigstudio/default.nix
View file

@ -114,7 +114,6 @@ stdenv.mkDerivation {
gtk3 gtk3
gtkmm3 gtkmm3
imagemagick imagemagick
intltool
libjack2 libjack2
libsigcxx libsigcxx
libxmlxx libxmlxx

3
pkgs/applications/graphics/xaos/default.nix
View file

@ -12,9 +12,10 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
nativeBuildInputs = [ intltool ];
buildInputs = [ buildInputs = [
aalib gsl libpng libX11 xorgproto libXext aalib gsl libpng libX11 xorgproto libXext
libXt zlib gettext intltool perl libXt zlib gettext perl
]; ];
preConfigure = '' preConfigure = ''

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

@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
"--enable-SIGCHLD-fallback" "--enable-SIGCHLD-fallback"
]; ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
Xaw3d Xaw3d
ghostscriptX ghostscriptX
perl perl
pkg-config
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
libiconv libiconv
]; ];

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

@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05"; sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ intltool gtk3 texinfo ]; buildInputs = [ gtk3 texinfo ];
meta = { meta = {
description = "A GTK enabled dropin replacement for xmessage"; description = "A GTK enabled dropin replacement for xmessage";

4
pkgs/applications/misc/pcmanx-gtk2/default.nix
View file

@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc"; sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc";
}; };
nativeBuildInputs = [ pkg-config automake autoconf ]; nativeBuildInputs = [ pkg-config automake autoconf intltool ];
buildInputs = [ gtk2 libXft intltool libtool ]; buildInputs = [ gtk2 libXft libtool ];
preConfigure = '' preConfigure = ''
./autogen.sh ./autogen.sh

3
pkgs/applications/misc/udevil/default.nix
View file

@ -20,11 +20,10 @@ stdenv.mkDerivation rec {
sha256 = "0nd44r8rbxifx4x4m24z5aji1c6k1fhw8cmf5s43wd5qys0bcdad"; sha256 = "0nd44r8rbxifx4x4m24z5aji1c6k1fhw8cmf5s43wd5qys0bcdad";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ buildInputs = [
glib glib
intltool
udev udev
]; ];

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

@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3"; sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook intltool ];
buildInputs = [ glib intltool gtk3 gtksourceview ]; buildInputs = [ glib gtk3 gtksourceview ];
meta = with lib; { meta = with lib; {
description = "A sticky note application for jotting down things to remember"; description = "A sticky note application for jotting down things to remember";

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

@ -23,14 +23,14 @@ stdenv.mkDerivation rec {
sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf"; sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf";
}; };
nativeBuildInputs = [ imake gccmakedep ]; nativeBuildInputs = [ imake gccmakedep pkg-config ];
buildInputs = [ buildInputs = [
libX11 libX11
libXt libXt
libXext libXext
libXpm libXpm
] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ]; ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf ];
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];

4
pkgs/applications/networking/ids/snort/default.nix
View file

@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "0xrc7crchflfrk4x5dq5zx22zkmgcrbkww5r1pvkc3cyyr18cc6h"; sha256 = "0xrc7crchflfrk4x5dq5zx22zkmgcrbkww5r1pvkc3cyyr18cc6h";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = [ pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; buildInputs = [ luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ];
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];

3
pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
View file

@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";
buildInputs = [ libotr pidgin intltool ]; nativeBuildInputs = [ intltool ];
buildInputs = [ libotr pidgin ];
meta = with lib; { meta = with lib; {
homepage = "https://otr.cypherpunks.ca/"; homepage = "https://otr.cypherpunks.ca/";

4
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix
View file

@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-CdA/aUu+CmCRbVBKpJGydicqFQa/rEsLWS3MBKlH2/M="; sha256 = "sha256-CdA/aUu+CmCRbVBKpJGydicqFQa/rEsLWS3MBKlH2/M=";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook intltool ];
buildInputs = [ glib intltool libappindicator-gtk2 libtool pidgin ]; buildInputs = [ glib libappindicator-gtk2 libtool pidgin ];
meta = with lib; { meta = with lib; {
description = "An AppIndicator and KStatusNotifierItem Plugin for Pidgin"; description = "An AppIndicator and KStatusNotifierItem Plugin for Pidgin";

3
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
View file

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b"; sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b";
}; };
buildInputs = [ pidgin intltool python2 ]; nativeBuildInputs = [ intltool ];
buildInputs = [ pidgin python2 ];
meta = with lib; { meta = with lib; {
homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack"; homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack";

4
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View file

@ -16,7 +16,7 @@ let unwrapped = stdenv.mkDerivation rec {
sha256 = "sha256-RUsbkovGvLsYM1OvMPv95VlfIkWjQjoaRubJei3yKBA="; sha256 = "sha256-RUsbkovGvLsYM1OvMPv95VlfIkWjQjoaRubJei3yKBA=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper intltool ];
NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";
@ -27,7 +27,7 @@ let unwrapped = stdenv.mkDerivation rec {
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
libxml2 nss nspr libxml2 nss nspr
libXScrnSaver python-with-dbus libXScrnSaver python-with-dbus
avahi dbus dbus-glib intltool libidn avahi dbus dbus-glib libidn
libICE libXext libSM cyrus_sasl libICE libXext libSM cyrus_sasl
libgnt ncurses # optional: build finch - the console UI libgnt ncurses # optional: build finch - the console UI
] ]

4
pkgs/applications/networking/sync/lsyncd/default.nix
View file

@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
dontUseCmakeBuildDir = true; dontUseCmakeBuildDir = true;
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ buildInputs = [
rsync rsync
lua pkg-config lua
asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt
]; ];

2
pkgs/applications/office/gnucash/default.nix
View file

@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
gettext gettext
makeWrapper makeWrapper
wrapGAppsHook wrapGAppsHook
pkg-config
]; ];
buildInputs = [ buildInputs = [
@ -55,7 +56,6 @@ stdenv.mkDerivation rec {
libofx libofx
libxml2 libxml2
libxslt libxslt
pkg-config
swig swig
webkitgtk webkitgtk
] ]

3
pkgs/applications/office/grisbi/default.nix
View file

@ -19,12 +19,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-vTrbq/xLTfwF7/YtKzZFiiSw8A0HzzWin2ry8gPHej8="; sha256 = "sha256-vTrbq/xLTfwF7/YtKzZFiiSw8A0HzzWin2ry8gPHej8=";
}; };
nativeBuildInputs = [ pkg-config wrapGAppsHook ]; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ];
buildInputs = [ buildInputs = [
gtk gtk
libgsf libgsf
libofx libofx
intltool
libsoup libsoup
gnome.adwaita-icon-theme gnome.adwaita-icon-theme
]; ];

4
pkgs/applications/office/homebank/default.nix
View file

@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Rg6OjHLkwVIDnXqzqPXA8DxqSdrh2T6V/gLBND8vx9o="; sha256 = "sha256-Rg6OjHLkwVIDnXqzqPXA8DxqSdrh2T6V/gLBND8vx9o=";
}; };
nativeBuildInputs = [ pkg-config wrapGAppsHook ]; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ];
buildInputs = [ gtk libofx intltool libsoup gnome.adwaita-icon-theme ]; buildInputs = [ gtk libofx libsoup gnome.adwaita-icon-theme ];
meta = with lib; { meta = with lib; {
description = "Free, easy, personal accounting for everyone"; description = "Free, easy, personal accounting for everyone";

1
pkgs/applications/office/libreoffice/default.nix
View file

@ -555,7 +555,6 @@ in
openssl openssl
pam pam
perl perl
pkg-config
poppler poppler
python3 python3
sane-backends sane-backends

3
pkgs/applications/radio/rtl-ais/default.nix
View file

@ -3,7 +3,8 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "rtl-ais"; pname = "rtl-ais";
version = "0.8.1"; version = "0.8.1";
buildInputs = [ pkg-config rtl-sdr libusb1 ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ rtl-sdr libusb1 ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dgiardini"; owner = "dgiardini";

3
pkgs/applications/radio/unixcw/default.nix
View file

@ -10,7 +10,8 @@ mkDerivation rec {
patches = [ patches = [
./remove-use-of-dlopen.patch ./remove-use-of-dlopen.patch
]; ];
buildInputs = [ libpulseaudio alsa-lib pkg-config qtbase ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ libpulseaudio alsa-lib qtbase ];
CFLAGS ="-lasound -lpulse-simple"; CFLAGS ="-lasound -lpulse-simple";
meta = with lib; { meta = with lib; {

3
pkgs/applications/radio/xlog/default.nix
View file

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
# glib-2.62 deprecations # glib-2.62 deprecations
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
buildInputs = [ glib pkg-config gtk2 hamlib ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib gtk2 hamlib ];
meta = with lib; { meta = with lib; {
description = "An amateur radio logging program"; description = "An amateur radio logging program";

3
pkgs/applications/science/biology/vcftools/default.nix
View file

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx"; sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx";
}; };
buildInputs = [ autoreconfHook pkg-config zlib perl ]; nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ zlib perl ];
meta = with lib; { 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"; description = "A set of tools written in Perl and C++ for working with VCF files, such as those generated by the 1000 Genomes Project";

3
pkgs/applications/science/geometry/drgeo/default.nix
View file

@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
}; };
patches = [ ./struct.patch ]; patches = [ ./struct.patch ];
nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [libglade gtk2 guile libxml2 buildInputs = [libglade gtk2 guile libxml2
perl intltool libtool pkg-config]; perl libtool ];
prebuild = '' prebuild = ''
cp drgeo.desktop.in drgeo.desktop cp drgeo.desktop.in drgeo.desktop

3
pkgs/applications/science/math/R/default.nix
View file

@ -23,10 +23,11 @@ stdenv.mkDerivation rec {
dontUseImakeConfigure = true; dontUseImakeConfigure = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu
pkg-config bison imake which blas lapack curl tcl tk jdk bison imake which blas lapack curl tcl tk jdk
] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ];
patches = [ patches = [

6
pkgs/applications/science/math/sage/sage-with-env.nix
View file

@ -28,9 +28,9 @@ assert (!blas.isILP64) && (!lapack.isILP64);
# executable sage. No tests are run yet and no documentation is built. # executable sage. No tests are run yet and no documentation is built.
let let
nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
pythonEnv # for patchShebangs pythonEnv # for patchShebangs
pkg-config
blas lapack blas lapack
singular singular
three three
@ -72,7 +72,7 @@ let
[] []
); );
allInputs = lib.remove null (buildInputs ++ pythonEnv.extraLibs ++ [ makeWrapper ]); allInputs = lib.remove null (nativeBuildInputs ++ buildInputs ++ pythonEnv.extraLibs ++ [ makeWrapper ]);
transitiveDeps = lib.unique (builtins.concatLists (map transitiveClosure allInputs )); transitiveDeps = lib.unique (builtins.concatLists (map transitiveClosure allInputs ));
# fix differences between spkg and sage names # fix differences between spkg and sage names
# (could patch sage instead, but this is more lightweight and also works for packages depending on sage) # (could patch sage instead, but this is more lightweight and also works for packages depending on sage)
@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
pname = "sage-with-env"; pname = "sage-with-env";
src = sage-env.lib.src; src = sage-env.lib.src;
inherit buildInputs; inherit nativeBuildInputs buildInputs;
configurePhase = "#do nothing"; configurePhase = "#do nothing";

3
pkgs/applications/terminal-emulators/mrxvt/default.nix
View file

@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl";
}; };
buildInputs = [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 libXft libXi xorgproto libSM libICE freetype which ];
configureFlags = [ configureFlags = [
"--with-x" "--with-x"

3
pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
View file

@ -44,9 +44,10 @@ stdenv.mkDerivation {
sha256 = "0badnkjsn3zps24r5iggj8k5v4f00npc77wqg92pcn1q5z8r677y"; sha256 = "0badnkjsn3zps24r5iggj8k5v4f00npc77wqg92pcn1q5z8r677y";
}; };
nativeBuildInputs = [ pkg-config ];
buildInputs = buildInputs =
[ libX11 libXt libXft ncurses # required to build the terminfo file [ libX11 libXt libXft ncurses # required to build the terminfo file
fontconfig freetype pkg-config libXrender fontconfig freetype libXrender
libptytty libptytty
] ++ optional perlSupport perl ] ++ optional perlSupport perl
++ optional gdkPixbufSupport gdk-pixbuf; ++ optional gdkPixbufSupport gdk-pixbuf;

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View file

@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
done done
''; '';
nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ] nativeBuildInputs = [ gettext perlPackages.perl makeWrapper pkg-config ]
++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x ++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_45 libxslt ]; docbook_xsl docbook_xml_dtd_45 libxslt ];
buildInputs = [ curl openssl zlib expat cpio libiconv bash ] buildInputs = [ curl openssl zlib expat cpio libiconv bash ]
@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals guiSupport [tcl tk] ++ lib.optionals guiSupport [tcl tk]
++ lib.optionals withpcre2 [ pcre2 ] ++ lib.optionals withpcre2 [ pcre2 ]
++ lib.optionals stdenv.isDarwin [ Security CoreServices ] ++ lib.optionals stdenv.isDarwin [ Security CoreServices ]
++ lib.optionals withLibsecret [ pkg-config glib libsecret ]; ++ lib.optionals withLibsecret [ glib libsecret ];
# required to support pthread_cancel() # required to support pthread_cancel()
NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s" NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"

3
pkgs/applications/video/byzanz/default.nix
View file

@ -34,12 +34,11 @@ stdenv.mkDerivation {
"-Wno-error=incompatible-pointer-types" "-Wno-error=incompatible-pointer-types"
]; ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ buildInputs = [
which which
gnome.gnome-common gnome.gnome-common
glib glib
intltool
libtool libtool
cairo cairo
gtk3 gtk3

4
pkgs/applications/virtualization/xen/generic.nix
View file

@ -66,9 +66,9 @@ stdenv.mkDerivation (rec {
hardeningDisable = [ "stackprotector" "fortify" "pic" ]; hardeningDisable = [ "stackprotector" "fortify" "pic" ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ buildInputs = [
cmake which which
# Xen # Xen
bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio

3
pkgs/applications/window-managers/fbpanel/default.nix
View file

@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/fbpanel/${pname}-${version}.tbz2"; url = "mirror://sourceforge/fbpanel/${pname}-${version}.tbz2";
sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965"; sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965";
}; };
nativeBuildInputs = [ pkg-config ];
buildInputs = buildInputs =
[ pkg-config libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ]; [ libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ];
preConfigure = "patchShebangs ."; preConfigure = "patchShebangs .";

4
pkgs/data/icons/tango-icon-theme/default.nix
View file

@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
patches = [ ./rsvg-convert.patch ]; patches = [ ./rsvg-convert.patch ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ intltool iconnamingutils imagemagick librsvg ]; buildInputs = [ iconnamingutils imagemagick librsvg ];
propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ];
# still missing parent icon themes: cristalsvg # still missing parent icon themes: cristalsvg

3
pkgs/data/misc/ddccontrol-db/default.nix
View file

@ -21,11 +21,10 @@ stdenv.mkDerivation rec {
./autogen.sh ./autogen.sh
''; '';
nativeBuildInputs = [ autoconf automake ]; nativeBuildInputs = [ autoconf automake intltool ];
buildInputs = buildInputs =
[ [
libtool libtool
intltool
]; ];
meta = with lib; { meta = with lib; {

2
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View file

@ -102,7 +102,6 @@ stdenv.mkDerivation rec {
libXdamage libXdamage
muffin muffin
networkmanager networkmanager
pkg-config
polkit polkit
libxml2 libxml2
libgnomekbd libgnomekbd
@ -134,6 +133,7 @@ stdenv.mkDerivation rec {
gtk-doc gtk-doc
perl perl
python3.pkgs.wrapPython python3.pkgs.wrapPython
pkg-config
]; ];
# use locales from cinnamon-translations (not using --localedir because datadir is used) # use locales from cinnamon-translations (not using --localedir because datadir is used)

6
pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
View file

@ -26,13 +26,13 @@ stdenv.mkDerivation rec {
}) })
]; ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ] ++ lib.optionals stdenv.isDarwin [ autoreconfHook ];
buildInputs = [ buildInputs = [
atk cairo glib gtk2 atk cairo glib gtk2
pango libxml2Python perl intltool pango libxml2Python perl
gettext gettext
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
autoreconfHook gnome-common gtk-mac-integration-gtk2 gnome-common gtk-mac-integration-gtk2
]; ];
preConfigure = optionalString stdenv.isDarwin '' preConfigure = optionalString stdenv.isDarwin ''

4
pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
View file

@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
]; ];
propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ]; propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config autoreconfHook intltool ];
buildInputs = [ intltool enchant isocodes autoreconfHook ]; buildInputs = [ enchant isocodes ];
} }

4
pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
View file

@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
#http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html #http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html
patches = [ ./01_remove-disable-deprecated.patch ]; patches = [ ./01_remove-disable-deprecated.patch ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ gtk2 intltool GConf enchant isocodes gnome-icon-theme ]; buildInputs = [ gtk2 GConf enchant isocodes gnome-icon-theme ];
NIX_LDFLAGS = "-lgthread-2.0"; NIX_LDFLAGS = "-lgthread-2.0";
} }

4
pkgs/desktops/gnome-2/platform/libgnome/default.nix
View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra-gtk2 libtool ]; buildInputs = [ popt zlib GConf gnome_vfs libcanberra-gtk2 libtool ];
propagatedBuildInputs = [ glib libbonobo libogg ]; propagatedBuildInputs = [ glib libbonobo libogg ];
} }

4
pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
View file

@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
patches = [ ./glib.patch ./cups_1.6.patch ]; patches = [ ./glib.patch ./cups_1.6.patch ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ gtk2 gettext intltool libart_lgpl ]; buildInputs = [ gtk2 gettext libart_lgpl ];
propagatedBuildInputs = [ libxml2 ]; propagatedBuildInputs = [ libxml2 ];
} }

4
pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
View file

@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
}) })
]; ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ gtk2 gettext intltool libart_lgpl libgnomecups bison flex ]; buildInputs = [ gtk2 gettext libart_lgpl libgnomecups bison flex ];
propagatedBuildInputs = [ libxml2 ]; propagatedBuildInputs = [ libxml2 ];

4
pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
View file

@ -9,6 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm"; sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome-icon-theme]; buildInputs = [ gtk2 gettext libgnomecanvas libgnomeprint gnome-icon-theme];
} }

3
pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix
View file

@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
updateScript = gnome.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome.gnome-devel-docs"; }; updateScript = gnome.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome.gnome-devel-docs"; };
}; };
buildInputs = [ intltool itstool libxml2 ]; nativeBuildInputs = [ intltool ];
buildInputs = [ itstool libxml2 ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/GNOME/gnome-devel-docs"; homepage = "https://github.com/GNOME/gnome-devel-docs";

4
pkgs/desktops/gnome/misc/gtkhtml/default.nix
View file

@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
updateScript = gnome.updateScript { packageName = "gtkhtml"; attrPath = "gnome.gtkhtml"; }; updateScript = gnome.updateScript { packageName = "gtkhtml"; attrPath = "gnome.gtkhtml"; };
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ gtk3 intltool gnome.adwaita-icon-theme buildInputs = [ gtk3 gnome.adwaita-icon-theme
gsettings-desktop-schemas ]; gsettings-desktop-schemas ];
propagatedBuildInputs = [ enchant isocodes ]; propagatedBuildInputs = [ enchant isocodes ];

2
pkgs/desktops/lxde/core/lxmenu-data/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8"; sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8";
}; };
buildInputs = [ intltool ]; nativeBuildInputs = [ intltool ];
meta = { meta = {
homepage = "https://lxde.org/"; homepage = "https://lxde.org/";

3
pkgs/development/compilers/gerbil/gerbil-crypto.nix
View file

@ -7,7 +7,8 @@ gerbil-support.gerbilPackage {
gerbil-package = "clan/crypto"; gerbil-package = "clan/crypto";
gerbil = gerbil-unstable; gerbil = gerbil-unstable;
gerbilInputs = [gerbil-support.gerbilPackages-unstable.gerbil-utils]; gerbilInputs = [gerbil-support.gerbilPackages-unstable.gerbil-utils];
buildInputs = [pkgs.secp256k1 pkgs.pkg-config]; nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [pkgs.secp256k1 ];
gambit-params = gambit-support.unstable-params; gambit-params = gambit-support.unstable-params;
version-path = "version"; version-path = "version";
softwareName = "Gerbil-crypto"; softwareName = "Gerbil-crypto";

3
pkgs/development/compilers/gerbil/gerbil-support.nix
View file

@ -24,12 +24,13 @@ rec {
gerbil ? pkgs.gerbil-unstable, gerbil ? pkgs.gerbil-unstable,
gambit-params ? pkgs.gambit-support.stable-params, gambit-params ? pkgs.gambit-support.stable-params,
gerbilInputs ? [], gerbilInputs ? [],
nativeBuildInputs ? [],
buildInputs ? [], buildInputs ? [],
buildScript ? "./build.ss", buildScript ? "./build.ss",
softwareName ? ""} : softwareName ? ""} :
let buildInputs_ = buildInputs; in let buildInputs_ = buildInputs; in
gccStdenv.mkDerivation rec { gccStdenv.mkDerivation rec {
inherit src meta pname version; inherit src meta pname version nativeBuildInputs;
passthru = { inherit gerbil-package version-path ;}; passthru = { inherit gerbil-package version-path ;};
buildInputs = [ gerbil ] ++ gerbilInputs ++ buildInputs_; buildInputs = [ gerbil ] ++ gerbilInputs ++ buildInputs_;
postPatch = '' postPatch = ''

2
pkgs/development/compilers/polyml/5.6.nix
View file

@ -20,7 +20,7 @@ stdenv.mkDerivation {
}) })
]; ];
buildInputs = lib.optional stdenv.isDarwin autoreconfHook; nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook;
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz"; url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz";

3
pkgs/development/interpreters/io/default.nix
View file

@ -24,13 +24,14 @@ stdenv.mkDerivation {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkg-config
]; ];
buildInputs = [ buildInputs = [
zlib sqlite gmp libffi cairo ncurses freetype zlib sqlite gmp libffi cairo ncurses freetype
libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2 libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2
freeglut libsamplerate pcre libevent libedit yajl freeglut libsamplerate pcre libevent libedit yajl
pkg-config glfw openssl libpthreadstubs libXdmcp glfw openssl libpthreadstubs libXdmcp
libmemcached python3 libmemcached python3
]; ];

3
pkgs/development/interpreters/qnial/default.nix
View file

@ -11,7 +11,7 @@ stdenv.mkDerivation {
owner = "vrthra"; owner = "vrthra";
}; };
nativeBuildInputs = [ makeWrapper unzip ]; nativeBuildInputs = [ makeWrapper unzip pkg-config ];
preConfigure = '' preConfigure = ''
cd build; cd build;
@ -25,7 +25,6 @@ stdenv.mkDerivation {
''; '';
buildInputs = [ buildInputs = [
pkg-config
ncurses ncurses
]; ];

4
pkgs/development/libraries/allegro/5.nix
View file

@ -18,14 +18,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-uNcaeTelFNfg+YjPYc7nK4TrFDxJsEuPhsF8x1cvIYQ="; sha256 = "sha256-uNcaeTelFNfg+YjPYc7nK4TrFDxJsEuPhsF8x1cvIYQ=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ buildInputs = [
texinfo libXext xorgproto libX11 libXpm libXt libXcursor texinfo libXext xorgproto libX11 libXpm libXt libXcursor
alsa-lib zlib libpng libvorbis libXxf86dga libXxf86misc alsa-lib zlib libpng libvorbis libXxf86dga libXxf86misc
libXxf86vm openal libGLU libGL libXxf86vm openal libGLU libGL
libjpeg flac libjpeg flac
libXi libXfixes libXi libXfixes
enet libtheora freetype physfs libopus pkg-config gtk3 pcre libXdmcp enet libtheora freetype physfs libopus gtk3 pcre libXdmcp
libpulseaudio libpthreadstubs libpulseaudio libpthreadstubs
]; ];

3
pkgs/development/libraries/apr-util/default.nix
View file

@ -26,8 +26,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
outputBin = "dev"; outputBin = "dev";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ] ++ optional stdenv.isFreeBSD autoreconfHook;
buildInputs = optional stdenv.isFreeBSD autoreconfHook;
configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ]
++ optional (!stdenv.isCygwin) "--with-crypto" ++ optional (!stdenv.isCygwin) "--with-crypto"

4
pkgs/development/libraries/dssi/default.nix
View file

@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "0kl1hzhb7cykzkrqcqgq1dk4xcgrcxv0jja251aq4z4l783jpj7j"; sha256 = "0kl1hzhb7cykzkrqcqgq1dk4xcgrcxv0jja251aq4z4l783jpj7j";
}; };
nativeBuildInputs = [ autoconf automake ]; nativeBuildInputs = [ autoconf automake pkg-config ];
buildInputs = buildInputs =
[ ladspaH libjack2 liblo alsa-lib qt4 libX11 libsndfile libSM [ ladspaH libjack2 liblo alsa-lib qt4 libX11 libsndfile libSM
libsamplerate libtool xorgproto libICE pkg-config libsamplerate libtool xorgproto libICE
]; ];
meta = with lib; { meta = with lib; {

3
pkgs/development/libraries/frame/default.nix
View file

@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "bc2a20cd3ac1e61fe0461bd3ee8cb250dbcc1fa511fad0686d267744e9c78f3a"; sha256 = "bc2a20cd3ac1e61fe0461bd3ee8cb250dbcc1fa511fad0686d267744e9c78f3a";
}; };
nativeBuildInputs = [ pkg-config ];
buildInputs = [ 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 = lib.optional enableX11 "--with-x11"; configureFlags = lib.optional enableX11 "--with-x11";

3
pkgs/development/libraries/ggz_base_libs/default.nix
View file

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1cw1vg0fbj36zyggnzidx9cbjwfc1yr4zqmsipxnvns7xa2awbdk"; sha256 = "1cw1vg0fbj36zyggnzidx9cbjwfc1yr4zqmsipxnvns7xa2awbdk";
}; };
buildInputs = [ intltool openssl expat libgcrypt ]; nativeBuildInputs = [ intltool ];
buildInputs = [ openssl expat libgcrypt ];
patchPhase = '' patchPhase = ''
substituteInPlace configure \ substituteInPlace configure \

4
pkgs/development/libraries/gtk-engines/default.nix
View file

@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm"; sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ intltool gtk2 ]; buildInputs = [ gtk2 ];
meta = { meta = {
description = "Theme engines for GTK 2"; description = "Theme engines for GTK 2";

4
pkgs/development/libraries/gtkspell/default.nix
View file

@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [aspell gtk2 enchant intltool]; buildInputs = [aspell gtk2 enchant];
meta = with lib; { meta = with lib; {
description = "Word-processor-style highlighting and replacement of misspelled words"; description = "Word-processor-style highlighting and replacement of misspelled words";

2
pkgs/development/libraries/liberfa/default.nix
View file

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "erfa"; pname = "erfa";
version = "2.0.0"; version = "2.0.0";
buildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "liberfa"; owner = "liberfa";

3
pkgs/development/libraries/libextractor/default.nix
View file

@ -45,10 +45,11 @@ stdenv.mkDerivation rec {
-e "s|pexe[[:blank:]]*=.*$|pexe = strdup(\"$out/lib/\");|g" -e "s|pexe[[:blank:]]*=.*$|pexe = strdup(\"$out/lib/\");|g"
''; '';
nativeBuildInputs = [ pkg-config ];
buildInputs = buildInputs =
[ libtool gettext zlib bzip2 flac libvorbis exiv2 [ libtool gettext zlib bzip2 flac libvorbis exiv2
libgsf rpm libgsf rpm
pkg-config
] ++ lib.optionals gstreamerSupport ] ++ lib.optionals gstreamerSupport
([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1)
++ lib.optionals gtkSupport [ glib gtk3 ] ++ lib.optionals gtkSupport [ glib gtk3 ]

2
pkgs/development/libraries/libinklevel/default.nix
View file

@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-J0cEaC5v4naO4GGUzdfV55kB7KzA+q+v64i5y5Xbp9Q="; sha256 = "sha256-J0cEaC5v4naO4GGUzdfV55kB7KzA+q+v64i5y5Xbp9Q=";
}; };
nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
pkg-config
libusb1 libusb1
]; ];

3
pkgs/development/libraries/libmx/default.nix
View file

@ -33,10 +33,9 @@ stdenv.mkDerivation rec {
configureScript = "sh autogen.sh"; configureScript = "sh autogen.sh";
nativeBuildInputs = [ pkg-config automake autoconf ]; nativeBuildInputs = [ pkg-config automake autoconf intltool ];
buildInputs = [ buildInputs = [
libtool libtool
intltool
gobject-introspection glib gobject-introspection glib
gtk2 gtk-doc clutter clutter-gtk gtk2 gtk-doc clutter clutter-gtk
]; ];

4
pkgs/development/libraries/libspectre/default.nix
View file

@ -11,9 +11,11 @@ stdenv.mkDerivation rec {
patches = [ ./libspectre-0.2.7-gs918.patch ]; patches = [ ./libspectre-0.2.7-gs918.patch ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
# Need `libgs.so'. # Need `libgs.so'.
pkg-config ghostscript cairo /*for tests*/ ghostscript cairo /*for tests*/
]; ];
doCheck = true; doCheck = true;

2
pkgs/development/libraries/libspng/default.nix
View file

@ -38,13 +38,13 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
pkg-config
zlib zlib
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
ninja ninja
meson meson
pkg-config
]; ];
meta = with lib; { meta = with lib; {

2
pkgs/development/libraries/libtoxcore/new-api.nix
View file

@ -33,7 +33,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ buildInputs = [
autoreconfHook libsodium ncurses check libconfig libsodium ncurses check libconfig
] ++ lib.optionals (!stdenv.isAarch32) [ ] ++ lib.optionals (!stdenv.isAarch32) [
libopus libopus
]; ];

4
pkgs/development/libraries/libwnck/2.nix
View file

@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "dev";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ]; buildInputs = [ gtk2 xorg.libX11 xorg.libXres ];
# ?another optional: startup-notification # ?another optional: startup-notification
configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK

3
pkgs/development/libraries/mlt/qt-5.nix
View file

@ -45,7 +45,6 @@ mkDerivation rec {
libvorbis libvorbis
libxml2 libxml2
movit movit
pkg-config
qtbase qtbase
qtsvg qtsvg
sox sox
@ -56,7 +55,7 @@ mkDerivation rec {
ladspaPlugins ladspaPlugins
]; ];
nativeBuildInputs = [ cmake which ]; nativeBuildInputs = [ cmake which pkg-config ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

1
pkgs/development/libraries/ogre/default.nix
View file

@ -57,7 +57,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake unzip pkg-config ]; nativeBuildInputs = [ cmake unzip pkg-config ];
buildInputs = buildInputs =
[ [
cmake
libGLU libGLU
libGL libGL
freetype freetype

2
pkgs/development/libraries/science/math/cliquer/default.nix
View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
buildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
]; ];

4
pkgs/development/libraries/sentry-native/default.nix
View file

@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-whbzoKIYLwj4yoFaT3frghJd/WzfpolSAuZzQRtnP5E="; sha256 = "sha256-whbzoKIYLwj4yoFaT3frghJd/WzfpolSAuZzQRtnP5E=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ curl breakpad pkg-config ]; buildInputs = [ curl breakpad ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
"-DSENTRY_BREAKPAD_SYSTEM=On" "-DSENTRY_BREAKPAD_SYSTEM=On"

3
pkgs/development/libraries/unicap/default.nix
View file

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9";
}; };
buildInputs = [ libusb-compat-0_1 libraw1394 dcraw intltool perl v4l-utils ]; nativeBuildInputs = [ intltool ];
buildInputs = [ libusb-compat-0_1 libraw1394 dcraw perl v4l-utils ];
patches = [ patches = [
# Debian has a patch that fixes the build. # Debian has a patch that fixes the build.

3
pkgs/development/libraries/vapoursynth-mvtools/default.nix
View file

@ -13,9 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "0lngkvxnzn82rz558nvl96rvclrck07ja1pny7wcfixp9b68ppkn"; sha256 = "0lngkvxnzn82rz558nvl96rvclrck07ja1pny7wcfixp9b68ppkn";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ buildInputs = [
autoreconfHook
nasm vapoursynth fftwFloat nasm vapoursynth fftwFloat
]; ];

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