Unverified Commit 4df684f1 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

samba: move env variable(s) into env for structuredAttrs (#488866)

parents ff891af5 01ecadd9

pkgs/servers/samba/4.x.nix

+11 −8
Original line number Diff line number Diff line
@@ -212,9 +212,17 @@ stdenv.mkDerivation (finalAttrs: { 
    chmod +w answers

  '';



  env.NIX_LDFLAGS = lib.optionalString (

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

  ) "--undefined-version";

  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")

      {

        NIX_LDFLAGS = "--undefined-version";

      };



  wafConfigureFlags = [

    "--with-static-modules=NONE"
@@ -261,11 +269,6 @@ stdenv.mkDerivation (finalAttrs: { 
    "--jobs 1"

  ];



  # 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";



  pythonPath = [

    python3Packages.dnspython

    python3Packages.markdown