public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #115228 from siraben/unzip-buildInputs

Browse Source 
treewide: unzip buildInputs to nativeBuildInputs (2)
This commit is contained in:
John Ericson
2021-03-06 13:30:43 -05:00
committed by GitHub
parent 6979a72840 4f0cdb68d7
commit f5a7d8bb41
24 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/misc/megasync/default.nix
View File

@@ -38,7 +38,7 @@ mkDerivation rec {
};
nativeBuildInputs =
[ autoconf automake doxygen lsb-release pkg-config qttools swig ];
[ autoconf automake doxygen lsb-release pkg-config qttools swig unzip ];
buildInputs = [
c-ares
cryptopp
@@ -53,7 +53,6 @@ mkDerivation rec {
qtbase
qtx11extras
sqlite
unzip
wget
];

3
pkgs/applications/misc/milu/default.nix
View File

@@ -22,10 +22,9 @@ stdenv.mkDerivation {
cp bin/milu $out/bin
'';
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
glib
unzip
llvmPackages.libclang
];

3
pkgs/applications/networking/browsers/firefox/common.nix
View File

@@ -154,7 +154,7 @@ buildStdenv.mkDerivation ({
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
@@ -215,6 +215,7 @@ buildStdenv.mkDerivation ({
rust-cbindgen
rustc
which
unzip
]
++ lib.optional gtk3Support wrapGAppsHook
++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ]

2
pkgs/applications/networking/mailreaders/thunderbird/68.nix
View File

@@ -98,6 +98,7 @@ stdenv.mkDerivation rec {
rustc
which
yasm
unzip
] ++ lib.optional gtk3Support wrapGAppsHook;
buildInputs = [
@@ -125,7 +126,6 @@ stdenv.mkDerivation rec {
pango
perl
sqlite
unzip
xorg.libX11
xorg.libXScrnSaver
xorg.libXcursor

2
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View File

@@ -99,6 +99,7 @@ stdenv.mkDerivation rec {
rustc
which
yasm
unzip
] ++ lib.optional gtk3Support wrapGAppsHook;
buildInputs = [
@@ -126,7 +127,6 @@ stdenv.mkDerivation rec {
pango
perl
sqlite
unzip
xorg.libX11
xorg.libXScrnSaver
xorg.libXcursor

2
pkgs/applications/video/kodi/default.nix
View File

@@ -177,7 +177,7 @@ in stdenv.mkDerivation {
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

4
pkgs/applications/video/vlc/default.nix
View File

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
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
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
++ 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;