Merge pull request #115228 from siraben/unzip-buildInputs

treewide: unzip buildInputs to nativeBuildInputs (2)

Changed files
+34 -39
nixos
modules
services
tests
pkgs
applications
misc
megasync
milu
networking
browsers
firefox
mailreaders
thunderbird
video
development
arduino
arduino-core
compilers
interpreters
unicon-lang
pharo
tools
build-managers
bazel
bazel_4
msbuild
misc
vscode-extensions
tools
misc
+1 -1
nixos/modules/services/misc/redmine.nix
···
unpack = id: (name: source:
pkgs.stdenv.mkDerivation {
name = "redmine-${id}-${name}";
-
buildInputs = [ pkgs.unzip ];
+
nativeBuildInputs = [ pkgs.unzip ];
buildCommand = ''
mkdir -p $out
cd $out
+2 -2
nixos/modules/services/web-apps/dokuwiki.nix
···
};
sourceRoot = ".";
# We need unzip to build this package
-
buildInputs = [ pkgs.unzip ];
+
nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
···
sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";
};
# We need unzip to build this package
-
buildInputs = [ pkgs.unzip ];
+
nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
+2 -2
nixos/modules/services/web-apps/wordpress.nix
···
sha256 = "1rhba5h5fjlhy8p05zf0p14c9iagfh96y91r36ni0rmk6y891lyd";
};
# We need unzip to build this package
-
buildInputs = [ pkgs.unzip ];
+
nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
···
sha256 = "0rjwm811f4aa4q43r77zxlpklyb85q08f9c8ns2akcarrvj5ydx3";
};
# We need unzip to build this package
-
buildInputs = [ pkgs.unzip ];
+
nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
+2 -2
nixos/tests/dokuwiki.nix
···
sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";
};
# We need unzip to build this package
-
buildInputs = [ pkgs.unzip ];
+
nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
···
sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8";
};
# We need unzip to build this package
-
buildInputs = [ pkgs.unzip ];
+
nativeBuildInputs = [ pkgs.unzip ];
sourceRoot = ".";
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
+1 -2
pkgs/applications/misc/megasync/default.nix
···
};
nativeBuildInputs =
-
[ autoconf automake doxygen lsb-release pkg-config qttools swig ];
+
[ autoconf automake doxygen lsb-release pkg-config qttools swig unzip ];
buildInputs = [
c-ares
cryptopp
···
qtbase
qtx11extras
sqlite
-
unzip
wget
];
+1 -2
pkgs/applications/misc/milu/default.nix
···
cp bin/milu $out/bin
'';
-
nativeBuildInputs = [ pkg-config ];
+
nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
glib
-
unzip
llvmPackages.libclang
];
+2 -1
pkgs/applications/networking/browsers/firefox/common.nix
···
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
xorg.pixman yasm libGLU libGL
xorg.xorgproto
-
xorg.libXext unzip makeWrapper
+
xorg.libXext makeWrapper
libevent libstartup_notification /* cairo */
libpng jemalloc glib
nasm icu67 libvpx_1_8
···
rust-cbindgen
rustc
which
+
unzip
]
++ lib.optional gtk3Support wrapGAppsHook
++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ]
+1 -1
pkgs/applications/networking/mailreaders/thunderbird/68.nix
···
rustc
which
yasm
+
unzip
] ++ lib.optional gtk3Support wrapGAppsHook;
buildInputs = [
···
pango
perl
sqlite
-
unzip
xorg.libX11
xorg.libXScrnSaver
xorg.libXcursor
+1 -1
pkgs/applications/networking/mailreaders/thunderbird/default.nix
···
rustc
which
yasm
+
unzip
] ++ lib.optional gtk3Support wrapGAppsHook;
buildInputs = [
···
pango
perl
sqlite
-
unzip
xorg.libX11
xorg.libXScrnSaver
xorg.libXcursor
+1 -1
pkgs/applications/video/kodi/default.nix
···
libogg libvorbis flac libxslt systemd
lzo libcdio libmodplug libass libbluray
sqlite libmysqlclient avahi lame
-
curl bzip2 zip unzip glxinfo
+
curl bzip2 zip glxinfo
libcec libcec_platform dcadec libuuid
libgcrypt libgpgerror libunistring
libcrossguid libplist
+2 -2
pkgs/applications/video/vlc/default.nix
···
zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
-
systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive
+
systemd gnutls avahi libcddb SDL SDL_image libmtp taglib libarchive
libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
···
++ optional jackSupport libjack2
++ optionals chromecastSupport [ protobuf libmicrodns ];
-
nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo ]
+
nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo unzip ]
++ optionals withQt5 [ wrapQtAppsHook ];
enableParallelBuilding = true;
+1 -2
pkgs/development/arduino/arduino-core/default.nix
···
# the glib setup hook will populate GSETTINGS_SCHEMAS_PATH,
# wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS
# so 'save as...' works:
-
nativeBuildInputs = [ glib wrapGAppsHook ];
+
nativeBuildInputs = [ glib wrapGAppsHook unzip ];
buildInputs = [
jdk
ant
libusb-compat-0_1
libusb1
-
unzip
zlib
ncurses5
readline
+2 -2
pkgs/development/compilers/openjdk/11.nix
···
sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw";
};
-
nativeBuildInputs = [ pkg-config autoconf ];
+
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
-
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+
cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
+2 -2
pkgs/development/compilers/openjdk/12.nix
···
sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
};
-
nativeBuildInputs = [ pkg-config autoconf ];
+
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
-
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+
cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11
] ++ lib.optionals (!headless && enableGnome2) [
+2 -2
pkgs/development/compilers/openjdk/13.nix
···
sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv";
};
-
nativeBuildInputs = [ pkg-config autoconf ];
+
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
-
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+
cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
+2 -2
pkgs/development/compilers/openjdk/14.nix
···
sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3";
};
-
nativeBuildInputs = [ pkg-config autoconf ];
+
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
-
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+
cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
+2 -2
pkgs/development/compilers/openjdk/8.nix
···
outputs = [ "out" "jre" ];
-
nativeBuildInputs = [ pkg-config lndir ];
+
nativeBuildInputs = [ pkg-config lndir unzip ];
buildInputs = [
-
cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib
+
cpio file which zip perl openjdk8-bootstrap zlib cups freetype alsaLib
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig
] ++ lib.optionals (!headless && enableGnome2) [
+2 -2
pkgs/development/compilers/openjdk/default.nix
···
sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l";
};
-
nativeBuildInputs = [ pkg-config autoconf ];
+
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
-
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+
cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
-1
pkgs/development/interpreters/unicon-lang/default.nix
···
homepage = "http://unicon.org";
};
}
-
+1 -2
pkgs/development/pharo/vm/build-vm.nix
···
# http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html
#
# (stack protection is disabled above for gcc 4.8 compatibility.)
-
nativeBuildInputs = [ autoreconfHook ];
+
nativeBuildInputs = [ autoreconfHook unzip ];
buildInputs = [
bash
-
unzip
glibc
openssl
gcc48
+1 -1
pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
···
src_for_updater = stdenv.mkDerivation rec {
name = "updater-sources";
inherit src;
-
buildInputs = [ unzip ];
+
nativeBuildInputs = [ unzip ];
inherit sourceRoot;
installPhase = ''
cp -r . "$out"
+1 -1
pkgs/development/tools/build-managers/msbuild/default.nix
···
nativeBuildInputs = [
dotnet-sdk
mono
+
unzip
];
buildInputs = [
dotnetPackages.Nuget
glibcLocales
makeWrapper
-
unzip
];
# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=msbuild
+1 -1
pkgs/misc/vscode-extensions/python/extract-nuget.nix
···
stdenv.mkDerivation {
inherit name version src;
-
buildInputs = [ unzip ];
+
nativeBuildInputs = [ unzip ];
dontBuild = true;
unpackPhase = "unzip $src";
installPhase = ''
+1 -2
pkgs/tools/misc/mc/default.nix
···
sha256 = "sha256-xt6txQWV8tmiLcbCmanyizk+NYNG6/bKREqEadwWbCc=";
};
-
nativeBuildInputs = [ pkg-config autoreconfHook ];
+
nativeBuildInputs = [ pkg-config autoreconfHook unzip ];
buildInputs = [
file
···
openssl
perl
slang
-
unzip
zip
] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];