b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #181302 from Artturin/fixcross4

Browse source 
lua-packages: fix eval failure when cross-compiling
This commit is contained in:
Artturi 2022-07-15 19:51:16 +03:00 committed by GitHub
parent c5ad016e42 4a53aba968
commit 192e3d44ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/languages-frameworks/maven.section.md
View file

@ -233,7 +233,8 @@ in stdenv.mkDerivation rec {
src = builtins.fetchTarball
"https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz";
buildInputs = [ maven makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ maven ];
buildPhase = ''
echo "Using repository ${repository}"
@ -310,7 +311,8 @@ in stdenv.mkDerivation rec {
src = builtins.fetchTarball
"https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz";
buildInputs = [ maven makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ maven ];
buildPhase = ''
echo "Using repository ${repository}"

2
doc/languages-frameworks/ruby.section.md
View file

@ -274,7 +274,7 @@ bundlerApp {
gemdir = ./.;
exes = [ "r10k" ];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/r10k --prefix PATH : ${lib.makeBinPath [ git gnutar gzip ]}

2
pkgs/applications/video/mpv/wrapper.nix
View file

@ -64,7 +64,7 @@ let
# TODO: don't link all mpv outputs and convert package to mpv-unwrapped?
paths = [ mpv.all ];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
passthru.unwrapped = mpv;

4
pkgs/desktops/gnustep/make/default.nix
View file

@ -22,7 +22,9 @@ stdenv.mkDerivation rec {
"GNUSTEP_INSTALLATION_DOMAIN=SYSTEM"
];
buildInputs = [ clang which libobjc ];
nativeBuildInputs = [ clang which ];
buildInputs = [ libobjc ];
patches = [ ./fixup-paths.patch ];
setupHook = ./setup-hook.sh;
meta = {

4
pkgs/desktops/gnustep/make/gsmakeDerivation.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, make, makeWrapper, which }:
{ buildInputs ? [], ...} @ args:
{ nativeBuildInputs ? [], ...} @ args:
stdenv.mkDerivation (args // {
buildInputs = [ makeWrapper make which ] ++ buildInputs;
nativeBuildInputs = [ makeWrapper make which ] ++ nativeBuildInputs;
builder = ./builder.sh;
setupHook = ./setup-hook.sh;

2
pkgs/development/python-modules/mutagen/default.nix
View file

@ -33,7 +33,7 @@ buildPythonPackage rec {
];
postInstall = ''
${python.interpreter} setup.py build_sphinx --build-dir=$doc
${python.pythonForBuild.interpreter} setup.py build_sphinx --build-dir=$doc
'';
checkInputs = [

3
pkgs/development/ruby-modules/bundler-app/default.nix
View file

@ -27,6 +27,7 @@
, allowSubstitutes ? false
, installManpages ? true
, meta ? {}
, nativeBuildInputs ? []
, buildInputs ? []
, postBuild ? ""
, gemConfig ? null
@ -39,7 +40,7 @@ let
cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" "gemset" "gemdir" ] // {
inherit preferLocalBuild allowSubstitutes; # pass the defaults
buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper;
nativeBuildInputs = nativeBuildInputs ++ lib.optionals (scripts != []) [ makeWrapper ];
meta = { platforms = ruby.meta.platforms; } // meta;
passthru = basicEnv.passthru // {

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

@ -60,7 +60,7 @@ in
# wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH
wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix {
inherit lua lib;
inherit (pkgs) makeSetupHook makeWrapper;
inherit (pkgs.buildPackages) makeSetupHook makeWrapper;
};
luarocks = callPackage ../development/tools/misc/luarocks/default.nix {