From f9c984d39fb757912b089401420961eebb5ec988 Mon Sep 17 00:00:00 2001
From: Michael Bishop <cleverca22@gmail.com>
Date: Tue, 7 May 2024 16:51:26 -0300
Subject: [PATCH] fix the isStatic flag, dedup the uclibc flags

---
 lib/systems/default.nix               |  2 +-
 lib/systems/examples.nix              | 10 +++++-----
 pkgs/by-name/uc/uclibc-ng/package.nix |  3 ---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 7e9aadeef72e5..bd639d9b4db4f 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -184,7 +184,7 @@ let
       # don't support dynamic linking, but don't get the `staticMarker`.
       # `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always
       # has the `staticMarker`.
-      isStatic = final.isWasm || final.isRedox;
+      isStatic = final.isWasm || final.isRedox || final.isUClibc;
 
       # Just a guess, based on `system`
       inherit
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 3924af3152f9e..cb9a01957852f 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -139,11 +139,11 @@ rec {
     libc = "uclibc";
     gcc.arch = "rv32ima";
     gcc.abi = "ilp32";
-  };
-
-  riscv32-nommu-musl = {
-    config = "riscv32-unknown-linux-musl";
-    libc = "musl";
+    uclibc.extraConfig = ''
+      UCLIBC_FORMAT_ELF y
+      STATIC_PIE y
+      HAVE_SHARED y
+    '';
   };
 
   mips64-embedded = {
diff --git a/pkgs/by-name/uc/uclibc-ng/package.nix b/pkgs/by-name/uc/uclibc-ng/package.nix
index b6e61e9dfd738..620c24bcd9adb 100644
--- a/pkgs/by-name/uc/uclibc-ng/package.nix
+++ b/pkgs/by-name/uc/uclibc-ng/package.nix
@@ -76,12 +76,9 @@ let
     HAS_NO_THREADS n
     UCLIBC_HAS_THREADS y
     UCLIBC_HAS_UTMPX y
-    HAVE_SHARED y
     ARCH_HAS_NO_SHARED n
     HAVE_LDSO y
-    STATIC_PIE y
     DOPIC y
-    UCLIBC_FORMAT_ELF y
   '';
   # UCLIBC_HAS_UTMPX is needed by busybox
 in