Unverified Commit 5b1e84da authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

luaformatter: fix x86_64 darwin (#345839)

parents 28635028 a50c6b51

pkgs/development/tools/luaformatter/default.nix→pkgs/by-name/lu/luaformatter/package.nix

+19 −4
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, yaml-cpp }:



{

  lib,

  stdenv,

  fetchFromGitHub,

  substituteAll,

  antlr4_9,

  libargs,

  catch2,

  cmake,

  yaml-cpp,

}:

let

  antlr4 = antlr4_9;

in



stdenv.mkDerivation rec {

  pname = "luaformatter";

  version = "1.3.6";
@@ -25,7 +33,14 @@ stdenv.mkDerivation rec { 


  nativeBuildInputs = [ cmake ];



  buildInputs = [ antlr4.runtime.cpp yaml-cpp ];

  buildInputs = [

    antlr4.runtime.cpp

    yaml-cpp

  ];



  env.NIX_CFLAGS_COMPILE = lib.optionalString (

    stdenv.isDarwin && stdenv.isx86_64

  ) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1";



  meta = with lib; {

    description = "Code formatter for Lua";

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -18079,8 +18079,6 @@ with pkgs; 














  lttv = callPackage ../development/tools/misc/lttv { };



























  luaformatter = callPackage ../development/tools/luaformatter { };



























  lurk = callPackage ../development/tools/lurk { };





























  maizzle = callPackage ../development/tools/maizzle { };