pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #181302 from Artturin/fixcross4

lua-packages: fix eval failure when cross-compiling

authored by Artturi and committed by GitHub 192e3d44 c5ad016e

+15 -10
unified split
+4 -2
doc/languages-frameworks/maven.section.md
··· 233 233 234 234 src = builtins.fetchTarball 235 235 "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; 236 - buildInputs = [ maven makeWrapper ]; 236 + nativeBuildInputs = [ makeWrapper ]; 237 + buildInputs = [ maven ]; 237 238 238 239 buildPhase = '' 239 240 echo "Using repository ${repository}" ··· 310 311 311 312 src = builtins.fetchTarball 312 313 "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; 313 - buildInputs = [ maven makeWrapper ]; 314 + nativeBuildInputs = [ makeWrapper ]; 315 + buildInputs = [ maven ]; 314 316 315 317 buildPhase = '' 316 318 echo "Using repository ${repository}"
+1 -1
doc/languages-frameworks/ruby.section.md
··· 274 274 gemdir = ./.; 275 275 exes = [ "r10k" ]; 276 276 277 - buildInputs = [ makeWrapper ]; 277 + nativeBuildInputs = [ makeWrapper ]; 278 278 279 279 postBuild = '' 280 280 wrapProgram $out/bin/r10k --prefix PATH : ${lib.makeBinPath [ git gnutar gzip ]}
+1 -1
pkgs/applications/video/mpv/wrapper.nix
··· 64 64 # TODO: don't link all mpv outputs and convert package to mpv-unwrapped? 65 65 paths = [ mpv.all ]; 66 66 67 - buildInputs = [ makeWrapper ]; 67 + nativeBuildInputs = [ makeWrapper ]; 68 68 69 69 passthru.unwrapped = mpv; 70 70
+3 -1
pkgs/desktops/gnustep/make/default.nix
··· 22 22 "GNUSTEP_INSTALLATION_DOMAIN=SYSTEM" 23 23 ]; 24 24 25 - buildInputs = [ clang which libobjc ]; 25 + nativeBuildInputs = [ clang which ]; 26 + buildInputs = [ libobjc ]; 27 + 26 28 patches = [ ./fixup-paths.patch ]; 27 29 setupHook = ./setup-hook.sh; 28 30 meta = {
+2 -2
pkgs/desktops/gnustep/make/gsmakeDerivation.nix
··· 1 1 { lib, stdenv, make, makeWrapper, which }: 2 - { buildInputs ? [], ...} @ args: 2 + { nativeBuildInputs ? [], ...} @ args: 3 3 stdenv.mkDerivation (args // { 4 - buildInputs = [ makeWrapper make which ] ++ buildInputs; 4 + nativeBuildInputs = [ makeWrapper make which ] ++ nativeBuildInputs; 5 5 6 6 builder = ./builder.sh; 7 7 setupHook = ./setup-hook.sh;
+1 -1
pkgs/development/python-modules/mutagen/default.nix
··· 33 33 ]; 34 34 35 35 postInstall = '' 36 - ${python.interpreter} setup.py build_sphinx --build-dir=$doc 36 + ${python.pythonForBuild.interpreter} setup.py build_sphinx --build-dir=$doc 37 37 ''; 38 38 39 39 checkInputs = [
+2 -1
pkgs/development/ruby-modules/bundler-app/default.nix
··· 27 27 , allowSubstitutes ? false 28 28 , installManpages ? true 29 29 , meta ? {} 30 + , nativeBuildInputs ? [] 30 31 , buildInputs ? [] 31 32 , postBuild ? "" 32 33 , gemConfig ? null ··· 39 40 cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" "gemset" "gemdir" ] // { 40 41 inherit preferLocalBuild allowSubstitutes; # pass the defaults 41 42 42 - buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper; 43 + nativeBuildInputs = nativeBuildInputs ++ lib.optionals (scripts != []) [ makeWrapper ]; 43 44 44 45 meta = { platforms = ruby.meta.platforms; } // meta; 45 46 passthru = basicEnv.passthru // {
+1 -1
pkgs/top-level/lua-packages.nix
··· 60 60 # wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH 61 61 wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix { 62 62 inherit lua lib; 63 - inherit (pkgs) makeSetupHook makeWrapper; 63 + inherit (pkgs.buildPackages) makeSetupHook makeWrapper; 64 64 }; 65 65 66 66 luarocks = callPackage ../development/tools/misc/luarocks/default.nix {