From daff0ad2b14be99a612d5cb96d61ee21068e6b01 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 26 Jan 2025 14:03:29 +0100 Subject: [PATCH 1/2] srsran: fix CPU option selection --- pkgs/by-name/sr/srsran/package.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sr/srsran/package.nix b/pkgs/by-name/sr/srsran/package.nix index f20c76ae2f6c..a3d7522d1107 100644 --- a/pkgs/by-name/sr/srsran/package.nix +++ b/pkgs/by-name/sr/srsran/package.nix @@ -14,6 +14,10 @@ soapysdr-with-plugins, libbladeRF, zeromq, + enableAvx ? stdenv.hostPlatform.avxSupport, + enableAvx2 ? stdenv.hostPlatform.avx2Support, + enableFma ? stdenv.hostPlatform.fmaSupport, + enableAvx512 ? stdenv.hostPlatform.avx512Support, }: stdenv.mkDerivation rec { @@ -45,7 +49,14 @@ stdenv.mkDerivation rec { zeromq ]; - cmakeFlags = [ "-DENABLE_WERROR=OFF" ]; + cmakeFlags = [ + "-DENABLE_WERROR=OFF" + (lib.cmakeBool "ENABLE_AVX" enableAvx) + (lib.cmakeBool "ENABLE_AVX2" enableAvx2) + (lib.cmakeBool "ENABLE_FMA" enableFma) + (lib.cmakeBool "ENABLE_AVX512" enableAvx512) + ]; + meta = with lib; { homepage = "https://www.srslte.com/"; From 5958dc9c46cd1bd1dd9f079f5a0998862f22964f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 26 Jan 2025 14:05:05 +0100 Subject: [PATCH 2/2] srsran: split output -> out, dev; remove static libs --- pkgs/by-name/sr/srsran/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/sr/srsran/package.nix b/pkgs/by-name/sr/srsran/package.nix index a3d7522d1107..3b32a70f7a6a 100644 --- a/pkgs/by-name/sr/srsran/package.nix +++ b/pkgs/by-name/sr/srsran/package.nix @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-3cQMZ75I4cyHpik2d/eBuzw7M4OgbKqroCddycw4uW8="; }; + outputs = [ + "out" + "dev" + ]; + nativeBuildInputs = [ cmake pkg-config @@ -57,6 +62,9 @@ stdenv.mkDerivation rec { (lib.cmakeBool "ENABLE_AVX512" enableAvx512) ]; + postInstall = lib.optionalString (!stdenv.hostPlatform.isStatic) '' + rm $out/lib/*.a + ''; meta = with lib; { homepage = "https://www.srslte.com/";