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

Merge pull request #115228 from siraben/unzip-buildInputs 

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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/redmine.nix
View File

@ -28,7 +28,7 @@ let
unpack = id: (name: source: unpack = id: (name: source:
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
name = "redmine-${id}-${name}"; name = "redmine-${id}-${name}";
buildInputs = [ pkgs.unzip ]; nativeBuildInputs = [ pkgs.unzip ];
buildCommand = '' buildCommand = ''
mkdir -p $out mkdir -p $out
cd $out cd $out

4
nixos/modules/services/web-apps/dokuwiki.nix
View File

@ -193,7 +193,7 @@ let
}; };
sourceRoot = "."; sourceRoot = ".";
# We need unzip to build this package # We need unzip to build this package
buildInputs = [ pkgs.unzip ]; nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory # Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/"; installPhase = "mkdir -p $out; cp -R * $out/";
}; };
@ -220,7 +220,7 @@ let
sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";
}; };
# We need unzip to build this package # We need unzip to build this package
buildInputs = [ pkgs.unzip ]; nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory # Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/"; installPhase = "mkdir -p $out; cp -R * $out/";
}; };

4
nixos/modules/services/web-apps/wordpress.nix
View File

@ -109,7 +109,7 @@ let
sha256 = "1rhba5h5fjlhy8p05zf0p14c9iagfh96y91r36ni0rmk6y891lyd"; sha256 = "1rhba5h5fjlhy8p05zf0p14c9iagfh96y91r36ni0rmk6y891lyd";
}; };
# We need unzip to build this package # We need unzip to build this package
buildInputs = [ pkgs.unzip ]; nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory # Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/"; installPhase = "mkdir -p $out; cp -R * $out/";
}; };
@ -136,7 +136,7 @@ let
sha256 = "0rjwm811f4aa4q43r77zxlpklyb85q08f9c8ns2akcarrvj5ydx3"; sha256 = "0rjwm811f4aa4q43r77zxlpklyb85q08f9c8ns2akcarrvj5ydx3";
}; };
# We need unzip to build this package # We need unzip to build this package
buildInputs = [ pkgs.unzip ]; nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory # Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/"; installPhase = "mkdir -p $out; cp -R * $out/";
}; };

4
nixos/tests/dokuwiki.nix
View File

@ -9,7 +9,7 @@ let
sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";
}; };
# We need unzip to build this package # We need unzip to build this package
buildInputs = [ pkgs.unzip ]; nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory # Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/"; installPhase = "mkdir -p $out; cp -R * $out/";
}; };
@ -24,7 +24,7 @@ let
sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8"; sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8";
}; };
# We need unzip to build this package # We need unzip to build this package
buildInputs = [ pkgs.unzip ]; nativeBuildInputs = [ pkgs.unzip ];
sourceRoot = "."; sourceRoot = ".";
# Installing simply means copying all files to the output directory # Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/"; installPhase = "mkdir -p $out; cp -R * $out/";

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

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

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

@ -22,10 +22,9 @@ stdenv.mkDerivation {
cp bin/milu $out/bin cp bin/milu $out/bin
''; '';
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [ buildInputs = [
glib glib
unzip
llvmPackages.libclang 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.libX11 xorg.libXrender xorg.libXft xorg.libXt file
xorg.pixman yasm libGLU libGL xorg.pixman yasm libGLU libGL
xorg.xorgproto xorg.xorgproto
xorg.libXext unzip makeWrapper xorg.libXext makeWrapper
libevent libstartup_notification /* cairo */ libevent libstartup_notification /* cairo */
libpng jemalloc glib libpng jemalloc glib
nasm icu67 libvpx_1_8 nasm icu67 libvpx_1_8
@ -215,6 +215,7 @@ buildStdenv.mkDerivation ({
rust-cbindgen rust-cbindgen
rustc rustc
which which
unzip
] ]
++ lib.optional gtk3Support wrapGAppsHook ++ lib.optional gtk3Support wrapGAppsHook
++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ] ++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ]

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

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

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

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

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

@ -177,7 +177,7 @@ in stdenv.mkDerivation {
libogg libvorbis flac libxslt systemd libogg libvorbis flac libxslt systemd
lzo libcdio libmodplug libass libbluray lzo libcdio libmodplug libass libbluray
sqlite libmysqlclient avahi lame sqlite libmysqlclient avahi lame
curl bzip2 zip unzip glxinfo curl bzip2 zip glxinfo
libcec libcec_platform dcadec libuuid libcec libcec_platform dcadec libuuid
libgcrypt libgpgerror libunistring libgcrypt libgpgerror libunistring
libcrossguid libplist 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 zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec 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 libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
++ optional jackSupport libjack2 ++ optional jackSupport libjack2
++ optionals chromecastSupport [ protobuf libmicrodns ]; ++ optionals chromecastSupport [ protobuf libmicrodns ];
nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo ] nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo unzip ]
++ optionals withQt5 [ wrapQtAppsHook ]; ++ optionals withQt5 [ wrapQtAppsHook ];
enableParallelBuilding = true; enableParallelBuilding = true;

3
pkgs/development/arduino/arduino-core/default.nix
View File

@ -116,13 +116,12 @@ stdenv.mkDerivation rec {
# the glib setup hook will populate GSETTINGS_SCHEMAS_PATH, # the glib setup hook will populate GSETTINGS_SCHEMAS_PATH,
# wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS # wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS
# so 'save as...' works: # so 'save as...' works:
nativeBuildInputs = [ glib wrapGAppsHook ]; nativeBuildInputs = [ glib wrapGAppsHook unzip ];
buildInputs = [ buildInputs = [
jdk jdk
ant ant
libusb-compat-0_1 libusb-compat-0_1
libusb1 libusb1
unzip
zlib zlib
ncurses5 ncurses5
readline readline

4
pkgs/development/compilers/openjdk/11.nix
View File

@ -25,9 +25,9 @@ let
sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw"; sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw";
}; };
nativeBuildInputs = [ pkg-config autoconf ]; nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [ 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 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [

4
pkgs/development/compilers/openjdk/12.nix
View File

@ -22,9 +22,9 @@ let
sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7"; sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
}; };
nativeBuildInputs = [ pkg-config autoconf ]; nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [ 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 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11 libXi libXinerama libXcursor libXrandr fontconfig openjdk11
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [

4
pkgs/development/compilers/openjdk/13.nix
View File

@ -22,9 +22,9 @@ let
sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv"; sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv";
}; };
nativeBuildInputs = [ pkg-config autoconf ]; nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [ 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 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [

4
pkgs/development/compilers/openjdk/14.nix
View File

@ -22,9 +22,9 @@ let
sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3"; sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3";
}; };
nativeBuildInputs = [ pkg-config autoconf ]; nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [ 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 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [

4
pkgs/development/compilers/openjdk/8.nix
View File

@ -83,9 +83,9 @@ let
outputs = [ "out" "jre" ]; outputs = [ "out" "jre" ];
nativeBuildInputs = [ pkg-config lndir ]; nativeBuildInputs = [ pkg-config lndir unzip ];
buildInputs = [ 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 libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig libXi libXinerama libXcursor libXrandr fontconfig
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [

4
pkgs/development/compilers/openjdk/default.nix
View File

@ -22,9 +22,9 @@ let
sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l"; sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l";
}; };
nativeBuildInputs = [ pkg-config autoconf ]; nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [ 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 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [

1
pkgs/development/interpreters/unicon-lang/default.nix
View File

@ -42,4 +42,3 @@ stdenv.mkDerivation {
homepage = "http://unicon.org"; homepage = "http://unicon.org";
}; };
} }

3
pkgs/development/pharo/vm/build-vm.nix
View File

@ -53,10 +53,9 @@ stdenv.mkDerivation rec {
# http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html # http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html
# #
# (stack protection is disabled above for gcc 4.8 compatibility.) # (stack protection is disabled above for gcc 4.8 compatibility.)
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook unzip ];
buildInputs = [ buildInputs = [
bash bash
unzip
glibc glibc
openssl openssl
gcc48 gcc48

2
pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
View File

@ -315,7 +315,7 @@ stdenv.mkDerivation rec {
src_for_updater = stdenv.mkDerivation rec { src_for_updater = stdenv.mkDerivation rec {
name = "updater-sources"; name = "updater-sources";
inherit src; inherit src;
buildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
inherit sourceRoot; inherit sourceRoot;
installPhase = '' installPhase = ''
cp -r . "$out" cp -r . "$out"

2
pkgs/development/tools/build-managers/msbuild/default.nix
View File

@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
dotnet-sdk dotnet-sdk
mono mono
unzip
]; ];
buildInputs = [ buildInputs = [
dotnetPackages.Nuget dotnetPackages.Nuget
glibcLocales glibcLocales
makeWrapper makeWrapper
unzip
]; ];
# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=msbuild # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=msbuild

2
pkgs/misc/vscode-extensions/python/extract-nuget.nix
View File

@ -4,7 +4,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
inherit name version src; inherit name version src;
buildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
dontBuild = true; dontBuild = true;
unpackPhase = "unzip $src"; unpackPhase = "unzip $src";
installPhase = '' installPhase = ''

3
pkgs/tools/misc/mc/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-xt6txQWV8tmiLcbCmanyizk+NYNG6/bKREqEadwWbCc="; sha256 = "sha256-xt6txQWV8tmiLcbCmanyizk+NYNG6/bKREqEadwWbCc=";
}; };
nativeBuildInputs = [ pkg-config autoreconfHook ]; nativeBuildInputs = [ pkg-config autoreconfHook unzip ];
buildInputs = [ buildInputs = [
file file
@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
openssl openssl
perl perl
slang slang
unzip
zip zip
] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; ] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];