Merge pull request #1923 from NotExactlySiev/nix-openbios

Nix: Add OpenBIOS to the build and refactor derivation

Author: nicolasnoble

flake.lock

@@ -24,18 +24,27 @@
     forGithubSystems = lib.genAttrs supportedSystems;
   in {
     packages = forAllSystems (system:
-      let pkgs = import nixpkgs { inherit system; };
+    let 
+      pkgs = nixpkgs.legacyPackages.${system};
+      cross = import nixpkgs {
+        inherit system;
+        crossSystem = "mipsel-none-elf";
+      };
     in {
+      default = self.packages.${system}.pcsx-redux;
+
       pcsx-redux = pkgs.callPackage ./pcsx-redux.nix {
           src = self;
           platforms = lib.systems.flakeExposed;
+          gccMips = cross.buildPackages.gccWithoutTargetLibc;
       };
-      # FIXME: default gets duplicated in githubActions
-      # default = self.packages.${system}.pcsx-redux;
     });
 
     githubActions = nix-github-actions.lib.mkGithubMatrix {
-      checks = forGithubSystems (system: self.packages.${system});
+      checks = forGithubSystems (system: 
+        # Prevent double build
+        builtins.removeAttrs self.packages.${system} ["default"]
+      );
     };
   };
 }

flake.nix

@@ -26,121 +26,104 @@
   uriparser,
   ucl,
   llhttp,
+  zip,
 
   src,
   debugBuild ? false,
   platforms,
+  gccMips,
+  withOpenbios ? true,
 }:
 let
-  zep = fetchFromGitHub {
-    owner = "grumpycoders";
-    repo = "zep";
-    rev = "86ea3c7019f45ccd4a13503bf7d98a396e8f0193";
-    hash = "sha256-6NmUlOHkRQvCgbATcNxnFrfA2ZWROPYN8Vpd10k6Z2g=";
-  };
-  nanosvg = fetchFromGitHub {
-    owner = "grumpycoders";
-    repo = "nanosvg";
-    rev = "f0a3e1034dd22e2e87e5db22401e44998383124e";
-    hash = "sha256-af11kAga6Ru2rPgrfcYswXNy9etvH3J9FX2T0I0++ew=";
-  };
-  nanovg = fetchFromGitHub {
-    owner = "grumpycoders";
-    repo = "nanovg";
-    rev = "7c021819bbd4843a1a3091fe47346d3fcb2a3e1a";
-    hash = "sha256-gZHbNuDkLXlLlXZZpLBHcbwzTfeBBkLY7xl4L5yr2lY=";
-  };
-  vixl = fetchFromGitHub {
-    owner = "grumpycoders";
-    repo = "vixl";
-    rev = "53ad192b26ddf6edd228a24ae1cffc363b442c01";
-    hash = "sha256-p9Z2lFzhqnHnFWfqT6BIJBVw2ZpkVIxykhG3jUHXA84=";
-  };
-  imgui-md = fetchFromGitHub {
+  # TODO: read the revs from elsewhere to avoid duplication
+  submodules = [
+    ({
+      owner = "grumpycoders";
+      repo = "zep";
+      rev = "86ea3c7019f45ccd4a13503bf7d98a396e8f0193";
+      hash = "sha256-6NmUlOHkRQvCgbATcNxnFrfA2ZWROPYN8Vpd10k6Z2g=";
+    })
+    ({
+      owner = "grumpycoders";
+      repo = "nanosvg";
+      rev = "f0a3e1034dd22e2e87e5db22401e44998383124e";
+      hash = "sha256-af11kAga6Ru2rPgrfcYswXNy9etvH3J9FX2T0I0++ew=";
+    })
+    ({
+      owner = "grumpycoders";
+      repo = "nanovg";
+      rev = "7c021819bbd4843a1a3091fe47346d3fcb2a3e1a";
+      hash = "sha256-gZHbNuDkLXlLlXZZpLBHcbwzTfeBBkLY7xl4L5yr2lY=";
+    })
+    ({
       owner = "mekhontsev";
       repo = "imgui_md";
       rev = "8ca75c5f7663f314821e3d0b2c51011792bee68f";
       hash = "sha256-uxhY81DWLRRCceYn9khk3rwzT+2f9PNMIMT9OrkPfFc=";
-  };
-  xbyak = fetchFromGitHub {
+    })
+    ({
       owner = "herumi";
       repo = "xbyak";
       rev = "2fb843c3287918038c8f76276a590c25cc7ec5ee";
       hash = "sha256-XZce+kEZ7dipI19WY43ycOjzM2dZyANMEN5+GhoNYUk=";
-  };
-  luafs = fetchFromGitHub {
+    })
+    ({
       owner = "lunarmodules";
       repo = "luafilesystem";
       rev = "912e06714fc276c15b4d5d1b42bd2b11edb8deff";
       hash = "sha256-BShByo2NhVrOHDPze/JXfeFWq36PFrI2HVugR2MDB0A=";
-  };
-  luajit = fetchFromGitHub {
+    })
+    ({
       owner = "grumpycoders";
       repo = "luajit";
       rev = "66fadd16a51955cfbd770de62806cfbdd7c6c818";
       hash = "sha256-nFlDr79GC8MsL6ausAsEPJwL8OJrFydB37tpD5mS1C8=";
-  };
-  imgui = fetchFromGitHub {
+    })
+    ({
       owner = "ocornut";
       repo = "imgui";
       rev = "368123ab06b2b573d585e52f84cd782c5c006697";
       hash = "sha256-6VOs7a31bEfAG75SQAY2X90h/f/HvqZmN615WXYkUOA=";
-  };
-  sdl-db = fetchFromGitHub {
+    })
+    ({
       owner = "mdqinc";
       repo = "SDL_GameControllerDB";
       rev = "b1e342774cbb35467dfdd3634d4f0181a76cbc89";
       hash = "sha256-LYvO+chDVo6D++fuFbxqSRltGW3y82SESmtFj39TdSA=";
+    })
+  ] ++ lib.optional stdenv.hostPlatform.isAarch {
+    owner = "grumpycoders";
+    repo = "vixl";
+    rev = "53ad192b26ddf6edd228a24ae1cffc363b442c01";
+    hash = "sha256-p9Z2lFzhqnHnFWfqT6BIJBVw2ZpkVIxykhG3jUHXA84=";
+  } ++ lib.optional withOpenbios {
+    owner = "grumpycoders";
+    repo = "uC-sdk";
+    rev = "69e06871824e2d62069487a7426ded09090ceb69";
+    hash = "sha256-VamLhNtXxilcvd6ch76ronhB7DcKfw2eL7CuLwHFbp8=";
   };
+
+  fetchSubmodule = { owner, repo, rev, hash }@args:
+      "cp -ru --no-preserve=all ${(fetchFromGitHub args).out} source/third_party/${repo}";
+
 in stdenv.mkDerivation {
   pname = "pcsx-redux";
   version = "0.99test";
   inherit src;
 
   postUnpack = ''
-    rm -rf source/third_party/miniaudio
-    rm -rf source/third_party/zep
-    rm -rf source/third_party/nanosvg
-    rm -rf source/third_party/nanovg
-    rm -rf source/third_party/imgui
-    rm -rf source/third_party/imgui_md
-    rm -rf source/third_party/xbyak
-    rm -rf source/third_party/luafilesystem
-    rm -rf source/third_party/SDL_GameControllerDB
-    rm -rf source/third_party/tracy
-    rm -rf source/third_party/luajit
-
-    cp -r ${miniaudio.out} source/third_party/miniaudio
-    cp -r ${zep.out} source/third_party/zep
-    cp -r ${nanosvg.out} source/third_party/nanosvg
-    cp -r ${nanovg.out} source/third_party/nanovg
-    cp -r ${imgui.out} source/third_party/imgui
-    cp -r ${imgui-md.out} source/third_party/imgui_md
-    cp -r ${xbyak.out} source/third_party/xbyak
-    cp -r ${luafs.out} source/third_party/luafilesystem
-    cp -r ${sdl-db.out} source/third_party/SDL_GameControllerDB
-    cp -r ${tracy.src} source/third_party/tracy
-    cp -r ${luajit.out} source/third_party/luajit
-
-    chmod -R +w source/third_party/miniaudio
-    chmod -R +w source/third_party/zep
-    chmod -R +w source/third_party/nanosvg
-    chmod -R +w source/third_party/nanovg
-    chmod -R +w source/third_party/imgui
-    chmod -R +w source/third_party/imgui_md
-    chmod -R +w source/third_party/luafilesystem
-    chmod -R +w source/third_party/SDL_GameControllerDB
-    chmod -R +w source/third_party/tracy
-    chmod -R +w source/third_party/luajit
-  ''
-  + lib.optionalString stdenv.hostPlatform.isAarch ''
-    cp -r ${vixl.out} source/third_party/vixl
-    chmod -R +w source/third_party/vixl
-  '';
+    cp -ru --no-preserve=all ${miniaudio.out} source/third_party/miniaudio
+    cp -ru --no-preserve=all ${tracy.src} source/third_party/tracy
+  '' + builtins.concatStringsSep "\n" (map fetchSubmodule submodules);
 
   nativeBuildInputs = [
     pkg-config
     imagemagick
+  ] ++ lib.optionals withOpenbios [
+    # unwrap them
+    gccMips.cc
+    gccMips.bintools.bintools
+    zip
   ];
 
   buildInputs = [
@@ -168,6 +151,14 @@ in stdenv.mkDerivation {
   ];
 
   makeFlags = [
+    (lib.optionalString withOpenbios "openbios")
+    "pcsx-redux"
+    "PREFIX=mipsel-unknown-none-elf"
+  ];
+
+  installFlags = [
+    "install"
+    (lib.optionalString withOpenbios "install-openbios")
     "DESTDIR=$(out)"
   ];
 
@@ -176,7 +167,7 @@ in stdenv.mkDerivation {
   enableDebugging = debugBuild;
 
   enableParallelBuilding = true;
-  NIX_BUILD_CORES = 2;
+  NIX_BUILD_CORES = 4;
 
   meta = {
     homepage = "https://pcsx-redux.consoledev.net";