piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2024-11-14 13:27:41 -07:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

flake: remove workaround no longer needed with Darwin SDK changes
Some checks are pending
macOS / ${{ matrix.arch }} (arm64) (push) Waiting to run
Details
macOS / ${{ matrix.arch }} (x86_64) (push) Waiting to run
Details
macOS / Universal binary (push) Blocked by required conditions
Details
Ubuntu / x86_64 (push) Waiting to run
Details
Ubuntu / aarch64 (push) Waiting to run
Details
Windows / build (push) Waiting to run
Details

Browse Source 
also add the Qt tools to the dev shell since they're needed for Qt
Designer and such
This commit is contained in:
Nadia Holmquist Pedersen 2024-11-05 07:58:31 +01:00
parent a5389286e8
commit d8f1d106f0
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock
View File

@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729665710, "lastModified": 1730531603,
"narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
flake.nix
View File

@ -19,7 +19,7 @@
then sourceInfo.dirtyShortRev then sourceInfo.dirtyShortRev
else sourceInfo.shortRev; else sourceInfo.shortRev;
melonDS = pkgs.qt6.qtbase.stdenv.mkDerivation { melonDS = pkgs.stdenv.mkDerivation {
pname = "melonDS"; pname = "melonDS";
version = "0.9.5-${shortRevision}"; version = "0.9.5-${shortRevision}";
src = ./.; src = ./.;
@ -74,8 +74,11 @@
drv = self.packages.${system}.default; drv = self.packages.${system}.default;
}; };
devShells = { devShells = {
default = pkgs.mkShell.override { stdenv = pkgs.qt6.qtbase.stdenv; } { default = pkgs.mkShell {
inputsFrom = [ self.packages.${system}.default ]; inputsFrom = [ self.packages.${system}.default ];
packages = with pkgs; [
qt6.qttools
];
}; };
# Shell for building static melonDS release builds with vcpkg # Shell for building static melonDS release builds with vcpkg