duckstation: migrate to by-name

NixOS · May 15, 2024 · e90f650 · e90f650
1 parent f9cb165
commit e90f650
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 31 deletions.
diff --git a/...s/duckstation/001-fix-test-inclusion.diff → ...u/duckstation/001-fix-test-inclusion.diff b/...s/duckstation/001-fix-test-inclusion.diff → ...u/duckstation/001-fix-test-inclusion.diff
diff --git a/...lators/duckstation/002-hardcode-vars.diff → ...ame/du/duckstation/002-hardcode-vars.diff b/...lators/duckstation/002-hardcode-vars.diff → ...ame/du/duckstation/002-hardcode-vars.diff
diff --git a/...cations/emulators/duckstation/default.nix → pkgs/by-name/du/duckstation/package.nix b/...cations/emulators/duckstation/default.nix → pkgs/by-name/du/duckstation/package.nix
@@ -1,26 +1,32 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, SDL2
-, cmake
-, cubeb
-, curl
-, extra-cmake-modules
-, libXrandr
-, libbacktrace
-, makeWrapper
-, ninja
-, pkg-config
-, qtbase
-, qtsvg
-, qttools
-, qtwayland
-, substituteAll
-, vulkan-loader
-, wayland
-, wrapQtAppsHook
+{
+  lib,
+  SDL2,
+  cmake,
+  cubeb,
+  curl,
+  extra-cmake-modules,
+  fetchFromGitHub,
+  libXrandr,
+  libbacktrace,
+  makeWrapper,
+  ninja,
+  pkg-config,
+  qt6,
+  stdenv,
+  substituteAll,
+  vulkan-loader,
+  wayland,
 }:
 
+let
+  inherit (qt6)
+    qtbase
+    qtsvg
+    qttools
+    qtwayland
+    wrapQtAppsHook
+  ;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "duckstation";
   version = "0.1-6292";
@@ -46,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
+    SDL2
     cmake
-    extra-cmake-modules
     ninja
     pkg-config
     qttools
@@ -57,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     SDL2
     curl
+    extra-cmake-modules
     libXrandr
     libbacktrace
     qtbase
@@ -66,17 +73,20 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ cubeb.passthru.backendLibs;
 
-  strictDeps = true;
-
   cmakeFlags = [
     (lib.cmakeBool "BUILD_TESTS" true)
   ];
 
-  doCheck = true;
-  checkPhase = ''
-    runHook preCheck
-    bin/common-tests
-    runHook postCheck
+  strictDeps = true;
+
+  doInstallCheck = true;
+
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    $out/share/duckstation/common-tests
+
+    runHook postInstallCheck
   '';
 
   installPhase = ''

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -2646,8 +2646,6 @@ with pkgs;
     inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit Carbon Cocoa;
   };
 
-  duckstation = qt6Packages.callPackage ../applications/emulators/duckstation { };
-
   dynamips = callPackage ../applications/emulators/dynamips { };
 
   emu2 = callPackage ../applications/emulators/emu2 { };