Unverified Commit 5dbafd10 authored by Emily's avatar Emily Committed by GitHub
Browse files

treewide: remove obsolete aligned allocation workarounds (#370749)

parents c0abc86d 205c1696

pkgs/applications/networking/ids/zeek/broker/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ stdenv.mkDerivation rec { 
    "-DPY_MOD_INSTALL_DIR=${placeholder "py"}/${python3.sitePackages}/"

  ];



  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation";



  meta = with lib; {

    description = "Zeek's Messaging Library";

    mainProgram = "broker-benchmark";

pkgs/applications/networking/ids/zeek/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ stdenv.mkDerivation rec { 
      "-DLIBKQUEUE_ROOT_DIR=${libkqueue}"

    ];



  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation";



  postInstall = ''

    for file in $out/share/zeek/base/frameworks/notice/actions/pp-alarms.zeek $out/share/zeek/base/frameworks/notice/main.zeek; do

      substituteInPlace $file \

pkgs/by-name/ca/caf/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ stdenv.mkDerivation rec { 
    "-DCAF_ENABLE_EXAMPLES:BOOL=OFF"

  ];



  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation";



  doCheck = !stdenv.hostPlatform.isDarwin;

  checkTarget = "test";

pkgs/by-name/ci/cinny-unwrapped/package.nix

+0 −5
Original line number Diff line number Diff line
@@ -30,11 +30,6 @@ buildNpmPackage rec { 


  npmDepsHash = "sha256-fDoia6evCmXZgeIKL0coRo3yunX1dfud31ROgmop2Sc=";



  # Fix error: no member named 'aligned_alloc' in the global namespace

  env.NIX_CFLAGS_COMPILE = lib.optionalString (

    stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0"

  ) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1";



  nativeBuildInputs = [

    python3

    pkg-config

pkgs/by-name/lu/luaformatter/package.nix

+0 −4
Original line number Diff line number Diff line
@@ -38,10 +38,6 @@ stdenv.mkDerivation rec { 
    yaml-cpp

  ];



  env.NIX_CFLAGS_COMPILE = lib.optionalString (

    stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64

  ) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1";



  meta = with lib; {

    description = "Code formatter for Lua";

    homepage = "https://github.com/Koihik/LuaFormatter";