Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

treewide: unzip buildInputs to nativeBuildInputs (2) #115228

Merged
merged 1 commit into from Mar 6, 2021
Merged

treewide: unzip buildInputs to nativeBuildInputs (2) #115228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/redmine.nix
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ let
unpack = id: (name: source:
pkgs.stdenv.mkDerivation {
name = "redmine-${id}-${name}";
buildInputs = [ pkgs.unzip ];
nativeBuildInputs = [ pkgs.unzip ];
buildCommand = ''
mkdir -p $out
cd $out
Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/services/web-apps/dokuwiki.nix
View file
Open in desktop
Expand Up @@ -193,7 +193,7 @@ let
};
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/";
};
Expand All @@ -220,7 +220,7 @@ let
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/";
};
Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/services/web-apps/wordpress.nix
View file
Open in desktop
Expand Up @@ -109,7 +109,7 @@ let
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/";
};
Expand All @@ -136,7 +136,7 @@ let
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/";
};
Expand Down
4 changes: 2 additions & 2 deletions nixos/tests/dokuwiki.nix
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ let
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/";
};
Expand All @@ -24,7 +24,7 @@ let
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/";
Expand Down
3 changes: 1 addition & 2 deletions pkgs/applications/misc/megasync/default.nix
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -53,7 +53,6 @@ mkDerivation rec {
qtbase
qtx11extras
sqlite
unzip
wget
];

Expand Down
3 changes: 1 addition & 2 deletions pkgs/applications/misc/milu/default.nix
View file
Open in desktop
Expand Up @@ -22,10 +22,9 @@ stdenv.mkDerivation {
cp bin/milu $out/bin
'';

nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
glib
unzip
llvmPackages.libclang
];

Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/networking/browsers/firefox/common.nix
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -215,6 +215,7 @@ buildStdenv.mkDerivation ({
rust-cbindgen
rustc
which
unzip
]
++ lib.optional gtk3Support wrapGAppsHook
++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ]
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/mailreaders/thunderbird/68.nix
View file
Open in desktop
Expand Up @@ -98,6 +98,7 @@ stdenv.mkDerivation rec {
rustc
which
yasm
unzip
] ++ lib.optional gtk3Support wrapGAppsHook;

buildInputs = [
Expand Down Expand Up @@ -125,7 +126,6 @@ stdenv.mkDerivation rec {
pango
perl
sqlite
unzip
xorg.libX11
xorg.libXScrnSaver
xorg.libXcursor
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/mailreaders/thunderbird/default.nix
View file
Open in desktop
Expand Up @@ -99,6 +99,7 @@ stdenv.mkDerivation rec {
rustc
which
yasm
unzip
] ++ lib.optional gtk3Support wrapGAppsHook;

buildInputs = [
Expand Down Expand Up @@ -126,7 +127,6 @@ stdenv.mkDerivation rec {
pango
perl
sqlite
unzip
xorg.libX11
xorg.libXScrnSaver
xorg.libXcursor
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/video/kodi/default.nix
View file
Open in desktop
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this has not been removed from the argument list.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

on staging it is there and unused. On staging-next it is also in buildInputs`.

libcec libcec_platform dcadec libuuid
libgcrypt libgpgerror libunistring
libcrossguid libplist
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/video/vlc/default.nix
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions pkgs/development/arduino/arduino-core/default.nix
View file
Open in desktop
Expand Up @@ -116,13 +116,12 @@ stdenv.mkDerivation rec {
# 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
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/compilers/openjdk/11.nix
View file
Open in desktop
Expand Up @@ -25,9 +25,9 @@ let
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) [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/compilers/openjdk/12.nix
View file
Open in desktop
Expand Up @@ -22,9 +22,9 @@ let
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) [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/compilers/openjdk/13.nix
View file
Open in desktop
Expand Up @@ -22,9 +22,9 @@ let
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) [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/compilers/openjdk/14.nix
View file
Open in desktop
Expand Up @@ -22,9 +22,9 @@ let
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) [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/compilers/openjdk/8.nix
View file
Open in desktop
Expand Up @@ -83,9 +83,9 @@ let

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) [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/compilers/openjdk/default.nix
View file
Open in desktop
Expand Up @@ -22,9 +22,9 @@ let
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) [
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/interpreters/unicon-lang/default.nix
View file
Open in desktop
Expand Up @@ -42,4 +42,3 @@ stdenv.mkDerivation {
homepage = "http://unicon.org";
};
}

3 changes: 1 addition & 2 deletions pkgs/development/pharo/vm/build-vm.nix
View file
Open in desktop
Expand Up @@ -53,10 +53,9 @@ stdenv.mkDerivation rec {
# 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
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
View file
Open in desktop
Expand Up @@ -315,7 +315,7 @@ stdenv.mkDerivation rec {
src_for_updater = stdenv.mkDerivation rec {
name = "updater-sources";
inherit src;
buildInputs = [ unzip ];
nativeBuildInputs = [ unzip ];
inherit sourceRoot;
installPhase = ''
cp -r . "$out"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/tools/build-managers/msbuild/default.nix
View file
Open in desktop
Expand Up @@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
dotnet-sdk
mono
unzip
];

buildInputs = [
dotnetPackages.Nuget
glibcLocales
makeWrapper
unzip
];

# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=msbuild
Expand Down
2 changes: 1 addition & 1 deletion pkgs/misc/vscode-extensions/python/extract-nuget.nix
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
stdenv.mkDerivation {
inherit name version src;

buildInputs = [ unzip ];
nativeBuildInputs = [ unzip ];
dontBuild = true;
unpackPhase = "unzip $src";
installPhase = ''
Expand Down
3 changes: 1 addition & 2 deletions pkgs/tools/misc/mc/default.nix
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-xt6txQWV8tmiLcbCmanyizk+NYNG6/bKREqEadwWbCc=";
};

nativeBuildInputs = [ pkg-config autoreconfHook ];
nativeBuildInputs = [ pkg-config autoreconfHook unzip ];

buildInputs = [
file
Expand All @@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
openssl
perl
slang
unzip
zip
] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];

Expand Down