Refactor Nix package definitions for improved clarity and consistency, including updates to overlays, dependencies, and build inputs across multiple packages.

2025-10-02 14:45:13 -06:00
parent 38959dc37b
commit e9fc085de1
14 changed files with 188 additions and 198 deletions
--- a/pkgs_pr/rmlint.nix
+++ b/pkgs_pr/rmlint.nix
@@ -44,35 +44,33 @@ stdenv.mkDerivation rec {
    })
  ];

-  nativeBuildInputs =
-    [
-      pkg-config
-      sphinx
-      scons
-    ]
-    ++ lib.optionals withGui [
-      makeWrapper
-      wrapGAppsHook3
-      gobject-introspection
-    ];
+  nativeBuildInputs = [
+    pkg-config
+    sphinx
+    scons
+  ]
+  ++ lib.optionals withGui [
+    makeWrapper
+    wrapGAppsHook3
+    gobject-introspection
+  ];

-  buildInputs =
-    [
-      glib
-      json-glib
-      util-linux
-    ]
-    ++ lib.optionals withGui [
-      cairo
-      gtksourceview3
-      pango
-      polkit
-      python3
-      python3.pkgs.pygobject3
-    ]
-    ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
-      elfutils
-    ];
+  buildInputs = [
+    glib
+    json-glib
+    util-linux
+  ]
+  ++ lib.optionals withGui [
+    cairo
+    gtksourceview3
+    pango
+    polkit
+    python3
+    python3.pkgs.pygobject3
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
+    elfutils
+  ];

  prePatch = ''
    # remove sources of nondeterminism