From 3dae8fdd0a1c1888d5b032e1676236d3b43d241a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 15 Jan 2026 14:03:15 +0200 Subject: [PATCH] samba: consistently use isCross using lib.systems.equal --- pkgs/servers/samba/4.x.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 502dff10a6f9..55664fb5418d 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -76,6 +76,7 @@ let } .${stdenv.hostPlatform.system} or (throw "Need pre-generated answers file to compile for ${stdenv.hostPlatform.system}"); + isCross = !lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform; in stdenv.mkDerivation (finalAttrs: { pname = "samba"; @@ -129,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals stdenv.hostPlatform.isLinux [ buildPackages.stdenv.cc ] - ++ optional (stdenv.buildPlatform != stdenv.hostPlatform) samba # asn1_compile/compile_et + ++ optional isCross samba # asn1_compile/compile_et ++ optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; @@ -193,7 +194,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs ./buildtools/bin '' - + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + + lib.optionalString isCross '' substituteInPlace wscript source3/wscript nsswitch/wscript_build lib/replace/wscript source4/ntvfs/sysdep/wscript_configure --replace-fail 'sys.platform' '"${stdenv.hostPlatform.parsed.kernel.name}"' ''; @@ -314,9 +315,9 @@ stdenv.mkDerivation (finalAttrs: { done ''; - disallowedReferences = lib.optionals ( - buildPackages.python3Packages.python != python3Packages.python - ) [ buildPackages.python3Packages.python ]; + disallowedReferences = lib.optionals isCross [ + buildPackages.python3Packages.python + ]; passthru.tests = { samba = nixosTests.samba;