Skip to content

Commit 636a1d1

Browse files
committed
qt frontend working in flake
1 parent 482049c commit 636a1d1

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

flake.nix

+8-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
3838
pkgs.darwin.apple_sdk.frameworks.Cocoa
3939
] ++ pkgs.lib.optionals (!pkgs.stdenv.isDarwin) [
40-
pkgs.qt6.full # TODO: Qt should work on Darwin too
40+
pkgs.qt6.qtbase # TODO: Qt should work on Darwin too
41+
pkgs.qt6.wrapQtAppsHook
4142
];
4243
stdenv = if pkgs.stdenv.isLinux then pkgs.stdenv
4344
else if pkgs.stdenv.isDarwin then pkgs.clang18Stdenv
@@ -67,6 +68,7 @@
6768
postInstall =
6869
if pkgs.stdenv.isLinux then ''
6970
wrapProgram $out/bin/n64 --set LD_LIBRARY_PATH ${pkgs.vulkan-loader}/lib
71+
wrapProgram $out/bin/n64-qt --set LD_LIBRARY_PATH ${pkgs.vulkan-loader}/lib
7072
'' else if pkgs.stdenv.isDarwin then ''
7173
wrapProgram $out/bin/n64 --set DYLD_FALLBACK_LIBRARY_PATH ${pkgs.darwin.moltenvk}/lib
7274
'' else throw "Unsupported platform";
@@ -78,6 +80,11 @@
7880
program = "${self.packages.${system}.default}/bin/n64";
7981
};
8082

83+
apps.qt = {
84+
type = "app";
85+
program = "${self.packages.${system}.default}/bin/n64-qt";
86+
};
87+
8188
devShells.default = pkgs.mkShell.override { stdenv = stdenv; }
8289
{
8390
buildInputs = devShellTools ++ tools ++ libs;

src/qt_frontend/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ target_link_libraries(${N64_TARGET}-qt Qt6::Widgets Qt6::Gui Qt6::Core common co
1616
set_target_properties(${N64_QT_TARGET}
1717
PROPERTIES
1818
RUNTIME_OUTPUT_DIRECTORY "${N64_EXECUTABLE_OUTPUT_PATH}"
19-
)
19+
)
20+
install(TARGETS ${N64_QT_TARGET} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)

0 commit comments

Comments
 (0)