diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-18 22:27:05 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-21 15:49:53 -0400 |
| commit | 9f2e05662bf7a33c394fa7d707905154d20a0db2 (patch) | |
| tree | d357340143c1fd401626d79d1f477ecdf97e37a7 /pkgs | |
| parent | 1e73b71e0309a033c373b322cc23b5776d76f7eb (diff) | |
| download | nixpkgs-9f2e05662bf7a33c394fa7d707905154d20a0db2.tar nixpkgs-9f2e05662bf7a33c394fa7d707905154d20a0db2.tar.gz nixpkgs-9f2e05662bf7a33c394fa7d707905154d20a0db2.tar.bz2 nixpkgs-9f2e05662bf7a33c394fa7d707905154d20a0db2.tar.lz nixpkgs-9f2e05662bf7a33c394fa7d707905154d20a0db2.tar.xz nixpkgs-9f2e05662bf7a33c394fa7d707905154d20a0db2.tar.zst nixpkgs-9f2e05662bf7a33c394fa7d707905154d20a0db2.zip | |
treewide: Manually fix miscategorized `autoreconfHook` `buildInputs`
These are the ones with odd indentation my script will mess up on.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index b4cd9f3f418..5cb019891ff 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -66,8 +66,9 @@ let # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. NROFF = "${groff}/bin/nroff"; - buildInputs = ops useRailsExpress [ autoreconfHook bison ] - ++ (op fiddleSupport libffi) + nativeBuildInputs = ops useRailsExpress [ autoreconfHook bison ]; + buildInputs = + (op fiddleSupport libffi) ++ (ops cursesSupport [ ncurses readline ]) ++ (op docSupport groff) ++ (op zlibSupport zlib) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index c3af49e08f2..feea51849cb 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -38,8 +38,9 @@ let patches = extraPatches; - buildInputs = [ autoreconfHook nukeReferences ] - ++ optionals buildKernel [ spl ] + nativeBuildInputs = [ autoreconfHook nukeReferences ]; + buildInputs = + optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ]; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 91efa306ce4..f940a5b646c 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -327,7 +327,7 @@ let url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip"; sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms"; }; - buildInputs = [ autoreconfHook unzip ]; + nativeBuildInputs = [ autoreconfHook unzip ]; meta = { homepage = "https://github.com/lua-stdlib/lua-stdlib/"; platforms = stdenv.lib.platforms.linux; |