rust: set empty flags if empty

cachix · Oct 5, 2024 · e4b7e9a · e4b7e9a
1 parent 5d72dbf
commit e4b7e9a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/modules/languages/rust.nix b/src/modules/languages/rust.nix
@@ -35,7 +35,7 @@ in
       defaultText = lib.literalExpression ''[ ]'';
       description = ''
         List of extra [targets](https://github.com/nix-community/fenix#supported-platforms-and-targets)
-        to install. Defaults to only the native target. 
+        to install. Defaults to only the native target.
       '';
     };
 
@@ -136,8 +136,8 @@ in
               if cfg.toolchain ? rust-src
               then "${cfg.toolchain.rust-src}/lib/rustlib/src/rust/library"
               else pkgs.rustPlatform.rustLibSrc;
-            RUSTFLAGS = "${moldFlags} ${cfg.rustflags}";
-            RUSTDOCFLAGS = "${moldFlags}";
+            RUSTFLAGS = lib.mkIf (moldFlags != "" || cfg.rustflags != "") (lib.concatStringsSep " " (lib.filter (x: x != "") [moldFlags cfg.rustflags]));
+            RUSTDOCFLAGS = lib.mkIf (moldFlags != "") moldFlags;
             CFLAGS = lib.optionalString pkgs.stdenv.isDarwin "-iframework ${config.devenv.profile}/Library/Frameworks";
           };