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

pkgs/citra/generic.nix

@@ -45,47 +45,46 @@ stdenv.mkDerivation {
     glslang
     pkg-config
     python3
-  ] ++ lib.optionals enableQt [ wrapQtAppsHook ];
+  ]
+  ++ lib.optionals enableQt [ wrapQtAppsHook ];
 
-  buildInputs =
-    [
-      boost
-      libusb1
-    ]
-    ++ lib.optionals enableQt [
-      qtbase
-      qtmultimedia
-    ]
-    ++ lib.optional enableSdl2 SDL2
-    ++ lib.optional enableQtTranslation qttools
-    ++ lib.optionals enableCubeb cubeb.passthru.backendLibs
-    ++ lib.optional (enableFfmpegAudioDecoder || enableFfmpegVideoDumper) ffmpeg_4
-    ++ lib.optional useDiscordRichPresence rapidjson
-    ++ lib.optional enableFdk fdk_aac;
+  buildInputs = [
+    boost
+    libusb1
+  ]
+  ++ lib.optionals enableQt [
+    qtbase
+    qtmultimedia
+  ]
+  ++ lib.optional enableSdl2 SDL2
+  ++ lib.optional enableQtTranslation qttools
+  ++ lib.optionals enableCubeb cubeb.passthru.backendLibs
+  ++ lib.optional (enableFfmpegAudioDecoder || enableFfmpegVideoDumper) ffmpeg_4
+  ++ lib.optional useDiscordRichPresence rapidjson
+  ++ lib.optional enableFdk fdk_aac;
 
-  cmakeFlags =
-    [
-      "-DUSE_SYSTEM_BOOST=ON"
-      "-DCITRA_WARNINGS_AS_ERRORS=OFF"
-      "-DCITRA_USE_BUNDLED_FFMPEG=OFF"
-      "-DCITRA_USE_BUNDLED_QT=OFF"
-      "-DUSE_SYSTEM_SDL2=ON"
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
+  cmakeFlags = [
+    "-DUSE_SYSTEM_BOOST=ON"
+    "-DCITRA_WARNINGS_AS_ERRORS=OFF"
+    "-DCITRA_USE_BUNDLED_FFMPEG=OFF"
+    "-DCITRA_USE_BUNDLED_QT=OFF"
+    "-DUSE_SYSTEM_SDL2=ON"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
 
-      # We dont want to bother upstream with potentially outdated compat reports
-      "-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON"
-      "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF" # We provide this deterministically
-    ]
-    ++ lib.optional (!enableSdl2) "-DENABLE_SDL2=OFF"
-    ++ lib.optional (!enableQt) "-DENABLE_QT=OFF"
-    ++ lib.optional enableQtTranslation "-DENABLE_QT_TRANSLATION=ON"
-    ++ lib.optional (!enableWebService) "-DENABLE_WEB_SERVICE=OFF"
-    ++ lib.optional (!enableCubeb) "-DENABLE_CUBEB=OFF"
-    ++ lib.optional enableFfmpegAudioDecoder "-DENABLE_FFMPEG_AUDIO_DECODER=ON"
-    ++ lib.optional enableFfmpegVideoDumper "-DENABLE_FFMPEG_VIDEO_DUMPER=ON"
-    ++ lib.optional useDiscordRichPresence "-DUSE_DISCORD_PRESENCE=ON"
-    ++ lib.optional enableFdk "-DENABLE_FDK=ON";
+    # We dont want to bother upstream with potentially outdated compat reports
+    "-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON"
+    "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF" # We provide this deterministically
+  ]
+  ++ lib.optional (!enableSdl2) "-DENABLE_SDL2=OFF"
+  ++ lib.optional (!enableQt) "-DENABLE_QT=OFF"
+  ++ lib.optional enableQtTranslation "-DENABLE_QT_TRANSLATION=ON"
+  ++ lib.optional (!enableWebService) "-DENABLE_WEB_SERVICE=OFF"
+  ++ lib.optional (!enableCubeb) "-DENABLE_CUBEB=OFF"
+  ++ lib.optional enableFfmpegAudioDecoder "-DENABLE_FFMPEG_AUDIO_DECODER=ON"
+  ++ lib.optional enableFfmpegVideoDumper "-DENABLE_FFMPEG_VIDEO_DUMPER=ON"
+  ++ lib.optional useDiscordRichPresence "-DUSE_DISCORD_PRESENCE=ON"
+  ++ lib.optional enableFdk "-DENABLE_FDK=ON";
 
   postPatch =
     let

pkgs/download.nix

@@ -2,7 +2,6 @@
   python3Packages,
   gallery-dl,
   ffmpeg,
-  callPackage,
   ...
 }:
 let
@@ -21,17 +20,16 @@ python3Packages.buildPythonApplication {
 
   build-system = [ python3Packages.setuptools ];
 
-  dependencies =
-    [
-      ffmpeg
-      gallery-dl
-      # (callPackage ../pkgs_pr/webcomix.nix { })
-    ]
-    ++ builtins.attrValues {
-      inherit (python3Packages)
-        pyyaml
-        types-pyyaml
-        yt-dlp
-        ;
-    };
+  dependencies = [
+    ffmpeg
+    gallery-dl
+    # (callPackage ../pkgs_pr/webcomix.nix { })
+  ]
+  ++ builtins.attrValues {
+    inherit (python3Packages)
+      pyyaml
+      types-pyyaml
+      yt-dlp
+      ;
+  };
 }

pkgs/polymc.nix

@@ -95,7 +95,8 @@ let
         cmakeFlags = [
           "-GNinja"
           "-DLauncher_QT_VERSION_MAJOR=${lib.versions.major qt6.qtbase.version}"
-        ] ++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
+        ]
+        ++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
 
         postPatch = ''
           # hardcode jdk paths

pkgs/torzu/package.nix

@@ -22,7 +22,6 @@
   lz4,
   python3,
   unzip,
-  nix-update-script,
   nlohmann_json,
   nv-codec-headers-12,
   pkg-config,
@@ -30,7 +29,6 @@
   vulkan-headers,
   vulkan-loader,
   yasm,
-  simpleini,
   zlib,
   vulkan-memory-allocator,
   zstd,

pkgs/tuh-activity-logger.nix

@@ -10,15 +10,14 @@ python3Packages.buildPythonApplication {
     name = "${pname}-${version}";
   };
   build-system = [ python3Packages.setuptools ];
-  dependencies =
-    [
-      sqlite
-    ]
-    ++ builtins.attrValues {
-      inherit (python3Packages)
-        beautifulsoup4
-        requests
-        matplotlib
-        ;
-    };
+  dependencies = [
+    sqlite
+  ]
+  ++ builtins.attrValues {
+    inherit (python3Packages)
+      beautifulsoup4
+      requests
+      matplotlib
+      ;
+  };
 }