fix(nix): include inputs from wrapped package in dev shell

this allows for things like icons to work when compiled in the dev shell using `cmake` as normal Signed-off-by: seth <getchoo@tuta.io>
PrismLauncher · Jan 23, 2024 · 56e8a3d · 56e8a3d
1 parent 12583c8
commit 56e8a3d
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 34 deletions.
diff --git a/nix/dev.nix b/nix/dev.nix
@@ -27,8 +27,17 @@
         ${config.pre-commit.installationScript}
       '';
 
-      inputsFrom = [config.packages.prismlauncher-unwrapped];
-      buildInputs = with pkgs; [ccache ninja];
+      inputsFrom = [
+        config.packages.prismlauncher-unwrapped
+        config.packages.prismlauncher
+      ];
+
+      buildInputs = with pkgs;
+        [ccache ninja]
+        ++ (let
+          runtime = callPackage ./pkg/runtime.nix {};
+        in
+          runtime.libs ++ runtime.programs);
     };
 
     formatter = pkgs.alejandra;

diff --git a/nix/pkg/runtime.nix b/nix/pkg/runtime.nix
@@ -0,0 +1,35 @@
+{
+  stdenv,
+  glfw,
+  libGL,
+  libpulseaudio,
+  mesa-demos,
+  openal,
+  pciutils,
+  udev,
+  xorg,
+}: {
+  libs = [
+    xorg.libX11
+    xorg.libXext
+    xorg.libXcursor
+    xorg.libXrandr
+    xorg.libXxf86vm
+
+    # lwjgl
+    libpulseaudio
+    libGL
+    glfw
+    openal
+    stdenv.cc.cc.lib
+
+    # oshi
+    udev
+  ];
+
+  programs = [
+    xorg.xrandr
+    mesa-demos # need glxinfo
+    pciutils # need lspci
+  ];
+}
diff --git a/nix/pkg/wrapper.nix b/nix/pkg/wrapper.nix
@@ -2,26 +2,19 @@
   lib,
   stdenv,
   symlinkJoin,
+  callPackage,
   prismlauncher-unwrapped,
   wrapQtAppsHook,
   makeWrapper,
   addOpenGLRunpath,
   qtbase, # needed for wrapQtAppsHook
   qtsvg,
   qtwayland,
-  xorg,
-  libpulseaudio,
-  libGL,
-  glfw,
   glfw-wayland-minecraft,
-  openal,
   jdk8,
   jdk17,
   gamemode,
   flite,
-  mesa-demos,
-  pciutils,
-  udev,
   libusb1,
   msaClientID ? null,
   gamemodeSupport ? stdenv.isLinux,
@@ -43,6 +36,8 @@ assert lib.assertMsg (withWaylandGLFW -> stdenv.isLinux) "withWaylandGLFW is onl
   unwrapped = prismlauncher-unwrapped.override {
     inherit msaClientID gamemodeSupport;
   };
+
+  runtime = callPackage ./runtime.nix {};
 in
   symlinkJoin {
     name = "prismlauncher-${unwrapped.version}";
@@ -79,35 +74,13 @@ in
 
     qtWrapperArgs = let
       runtimeLibs =
-        [
-          xorg.libX11
-          xorg.libXext
-          xorg.libXcursor
-          xorg.libXrandr
-          xorg.libXxf86vm
-
-          # lwjgl
-          libpulseaudio
-          libGL
-          glfw
-          openal
-          stdenv.cc.cc.lib
-
-          # oshi
-          udev
-        ]
+        runtime.libs
         ++ lib.optional gamemodeSupport gamemode.lib
         ++ lib.optional textToSpeechSupport flite
         ++ lib.optional controllerSupport libusb1
         ++ additionalLibs;
 
-      runtimePrograms =
-        [
-          xorg.xrandr
-          mesa-demos # need glxinfo
-          pciutils # need lspci
-        ]
-        ++ additionalPrograms;
+      runtimePrograms = runtime.programs ++ additionalPrograms;
     in
       ["--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"]
       ++ lib.optionals stdenv.isLinux [