summary refs log tree commit diff
diff options
context:
space:
mode:
authorAnderson Torres <torres.anderson.85@protonmail.com>2023-07-09 23:04:12 -0300
committerAnderson Torres <torres.anderson.85@protonmail.com>2023-08-05 11:10:50 +0000
commitdd8d813a73e1a7c4a2a34de3d209c282caf8904e (patch)
tree9d25efa2d92429076477bd173e4a677617a290cb
parenta63c9818ba93175ab46a9ed6c63e2777e9bd3ea9 (diff)
downloadnixpkgs-dd8d813a73e1a7c4a2a34de3d209c282caf8904e.tar
nixpkgs-dd8d813a73e1a7c4a2a34de3d209c282caf8904e.tar.gz
nixpkgs-dd8d813a73e1a7c4a2a34de3d209c282caf8904e.tar.bz2
nixpkgs-dd8d813a73e1a7c4a2a34de3d209c282caf8904e.tar.lz
nixpkgs-dd8d813a73e1a7c4a2a34de3d209c282caf8904e.tar.xz
nixpkgs-dd8d813a73e1a7c4a2a34de3d209c282caf8904e.tar.zst
nixpkgs-dd8d813a73e1a7c4a2a34de3d209c282caf8904e.zip
blackshades: use zigHook
Also, a cosmetic refactor:

- Reorder parameter listing
- Use rec-less, overlay-style overridable recursive attributes (in effect since
NixOS#119942);
- Remove nested with (according to
https://nix.dev/recipes/best-practices#with-scopes)
-rw-r--r--pkgs/games/blackshades/default.nix41
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 27 insertions, 18 deletions
diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix
index bd21fc08070..c107b068816 100644
--- a/pkgs/games/blackshades/default.nix
+++ b/pkgs/games/blackshades/default.nix
@@ -1,34 +1,41 @@
-{ lib, stdenv, fetchFromSourcehut
-, zig, glfw, libGLU, libGL, openal, libsndfile }:
+{ lib
+, stdenv
+, fetchFromSourcehut
+, glfw
+, libGL
+, libGLU
+, libsndfile
+, openal
+, zigHook
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "blackshades";
   version = "2.4.9";
 
   src = fetchFromSourcehut {
     owner = "~cnx";
-    repo = pname;
-    rev = version;
+    repo = "blackshades";
+    rev = finalAttrs.version;
     fetchSubmodules = true;
-    sha256 = "sha256-Hg+VcWI28GzY/CPm1lUftP0RGztOnzizrKJQVTmeJ9I=";
+    hash = "sha256-Hg+VcWI28GzY/CPm1lUftP0RGztOnzizrKJQVTmeJ9I=";
   };
 
-  nativeBuildInputs = [ zig ];
-  buildInputs = [ glfw libGLU libGL openal libsndfile ];
+  nativeBuildInputs = [ zigHook ];
 
-  preBuild = ''
-    export HOME=$TMPDIR
-  '';
-
-  installPhase = ''
-    zig build -Drelease-fast -Dcpu=baseline --prefix $out install
-  '';
+  buildInputs = [
+    glfw
+    libGLU
+    libGL
+    libsndfile
+    openal
+  ];
 
   meta = {
     homepage = "https://sr.ht/~cnx/blackshades";
     description = "A psychic bodyguard FPS";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ McSinyx viric ];
-    platforms = with lib.platforms; linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28809866670..9faff778221 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37145,7 +37145,9 @@ with pkgs;
   };
 
   blackshades = callPackage ../games/blackshades {
-    zig = buildPackages.zig_0_9;
+    zigHook = zigHook.override {
+      zig = buildPackages.zig_0_9;
+    };
   };
 
   blobby = callPackage ../games/blobby { };