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

treewide: Manually fix miscategorized autoreconfHook buildInputs

Browse Source 
These are the ones with odd indentation my script will mess up on.
This commit is contained in:
John Ericson 2017-09-18 22:27:05 -04:00
parent 1e73b71e03
commit 9f2e05662b
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/interpreters/ruby/default.nix
View File

@ -66,8 +66,9 @@ let
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
NROFF = "${groff}/bin/nroff"; NROFF = "${groff}/bin/nroff";
buildInputs = ops useRailsExpress [ autoreconfHook bison ] nativeBuildInputs = ops useRailsExpress [ autoreconfHook bison ];
++ (op fiddleSupport libffi) buildInputs =
(op fiddleSupport libffi)
++ (ops cursesSupport [ ncurses readline ]) ++ (ops cursesSupport [ ncurses readline ])
++ (op docSupport groff) ++ (op docSupport groff)
++ (op zlibSupport zlib) ++ (op zlibSupport zlib)

5
pkgs/os-specific/linux/zfs/default.nix
View File

@ -38,8 +38,9 @@ let
patches = extraPatches; patches = extraPatches;
buildInputs = [ autoreconfHook nukeReferences ] nativeBuildInputs = [ autoreconfHook nukeReferences ];
++ optionals buildKernel [ spl ] buildInputs =
optionals buildKernel [ spl ]
++ optionals buildUser [ zlib libuuid python attr ]; ++ optionals buildUser [ zlib libuuid python attr ];
# for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work

2
pkgs/top-level/lua-packages.nix
View File

@ -327,7 +327,7 @@ let
url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip"; url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip";
sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms"; sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms";
}; };
buildInputs = [ autoreconfHook unzip ]; nativeBuildInputs = [ autoreconfHook unzip ];
meta = { meta = {
homepage = "https://github.com/lua-stdlib/lua-stdlib/"; homepage = "https://github.com/lua-stdlib/lua-stdlib/";
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;