Unverified Commit 2ceaa350 authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

talloc: move NIX_LDFLAGS into env for structuredAttrs (#486072)

parents 7e7d6dd3 5e80541a

pkgs/by-name/ta/talloc/package.nix

+12 −9
Original line number Diff line number Diff line
@@ -60,15 +60,18 @@ stdenv.mkDerivation rec { 
    "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"

  ];



  env = {

    # python-config from build Python gives incorrect values when cross-compiling.

    # If python-config is not found, the build falls back to using the sysconfig

    # module, which works correctly in all cases.

    PYTHON_CONFIG = "/invalid";



  }

  //

    lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17")

      {

        # https://reviews.llvm.org/D135402

  NIX_LDFLAGS = lib.optional (

    stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17"

  ) "--undefined-version";

        NIX_LDFLAGS = "--undefined-version";

      };



  # this must not be exported before the ConfigurePhase otherwise waf whines

  preBuild = lib.optionalString stdenv.hostPlatform.isMusl ''