mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-20 20:20:26 +03:00
Merge pull request #181302 from Artturin/fixcross4
lua-packages: fix eval failure when cross-compiling
This commit is contained in:
commit
192e3d44ac
@ -233,7 +233,8 @@ in stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
src = builtins.fetchTarball
|
src = builtins.fetchTarball
|
||||||
"https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz";
|
"https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz";
|
||||||
buildInputs = [ maven makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
buildInputs = [ maven ];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
echo "Using repository ${repository}"
|
echo "Using repository ${repository}"
|
||||||
@ -310,7 +311,8 @@ in stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
src = builtins.fetchTarball
|
src = builtins.fetchTarball
|
||||||
"https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz";
|
"https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz";
|
||||||
buildInputs = [ maven makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
buildInputs = [ maven ];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
echo "Using repository ${repository}"
|
echo "Using repository ${repository}"
|
||||||
|
@ -274,7 +274,7 @@ bundlerApp {
|
|||||||
gemdir = ./.;
|
gemdir = ./.;
|
||||||
exes = [ "r10k" ];
|
exes = [ "r10k" ];
|
||||||
|
|
||||||
buildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
wrapProgram $out/bin/r10k --prefix PATH : ${lib.makeBinPath [ git gnutar gzip ]}
|
wrapProgram $out/bin/r10k --prefix PATH : ${lib.makeBinPath [ git gnutar gzip ]}
|
||||||
|
@ -64,7 +64,7 @@ let
|
|||||||
# TODO: don't link all mpv outputs and convert package to mpv-unwrapped?
|
# TODO: don't link all mpv outputs and convert package to mpv-unwrapped?
|
||||||
paths = [ mpv.all ];
|
paths = [ mpv.all ];
|
||||||
|
|
||||||
buildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
passthru.unwrapped = mpv;
|
passthru.unwrapped = mpv;
|
||||||
|
|
||||||
|
@ -22,7 +22,9 @@ stdenv.mkDerivation rec {
|
|||||||
"GNUSTEP_INSTALLATION_DOMAIN=SYSTEM"
|
"GNUSTEP_INSTALLATION_DOMAIN=SYSTEM"
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [ clang which libobjc ];
|
nativeBuildInputs = [ clang which ];
|
||||||
|
buildInputs = [ libobjc ];
|
||||||
|
|
||||||
patches = [ ./fixup-paths.patch ];
|
patches = [ ./fixup-paths.patch ];
|
||||||
setupHook = ./setup-hook.sh;
|
setupHook = ./setup-hook.sh;
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{ lib, stdenv, make, makeWrapper, which }:
|
{ lib, stdenv, make, makeWrapper, which }:
|
||||||
{ buildInputs ? [], ...} @ args:
|
{ nativeBuildInputs ? [], ...} @ args:
|
||||||
stdenv.mkDerivation (args // {
|
stdenv.mkDerivation (args // {
|
||||||
buildInputs = [ makeWrapper make which ] ++ buildInputs;
|
nativeBuildInputs = [ makeWrapper make which ] ++ nativeBuildInputs;
|
||||||
|
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
setupHook = ./setup-hook.sh;
|
setupHook = ./setup-hook.sh;
|
||||||
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
${python.interpreter} setup.py build_sphinx --build-dir=$doc
|
${python.pythonForBuild.interpreter} setup.py build_sphinx --build-dir=$doc
|
||||||
'';
|
'';
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
, allowSubstitutes ? false
|
, allowSubstitutes ? false
|
||||||
, installManpages ? true
|
, installManpages ? true
|
||||||
, meta ? {}
|
, meta ? {}
|
||||||
|
, nativeBuildInputs ? []
|
||||||
, buildInputs ? []
|
, buildInputs ? []
|
||||||
, postBuild ? ""
|
, postBuild ? ""
|
||||||
, gemConfig ? null
|
, gemConfig ? null
|
||||||
@ -39,7 +40,7 @@ let
|
|||||||
cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" "gemset" "gemdir" ] // {
|
cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" "gemset" "gemdir" ] // {
|
||||||
inherit preferLocalBuild allowSubstitutes; # pass the defaults
|
inherit preferLocalBuild allowSubstitutes; # pass the defaults
|
||||||
|
|
||||||
buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper;
|
nativeBuildInputs = nativeBuildInputs ++ lib.optionals (scripts != []) [ makeWrapper ];
|
||||||
|
|
||||||
meta = { platforms = ruby.meta.platforms; } // meta;
|
meta = { platforms = ruby.meta.platforms; } // meta;
|
||||||
passthru = basicEnv.passthru // {
|
passthru = basicEnv.passthru // {
|
||||||
|
@ -60,7 +60,7 @@ in
|
|||||||
# wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH
|
# wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH
|
||||||
wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix {
|
wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix {
|
||||||
inherit lua lib;
|
inherit lua lib;
|
||||||
inherit (pkgs) makeSetupHook makeWrapper;
|
inherit (pkgs.buildPackages) makeSetupHook makeWrapper;
|
||||||
};
|
};
|
||||||
|
|
||||||
luarocks = callPackage ../development/tools/misc/luarocks/default.nix {
|
luarocks = callPackage ../development/tools/misc/luarocks/default.nix {
|
||||||
|
Loading…
Reference in New Issue
Block a user