nur-packages

commit b4d1a5976ba1f38505a51b997188a0aa10c247e9
parent b7a31d22a6fa4c2b090f706588ada9030331cada
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Thu, 26 Oct 2023 01:11:39 +0400

Up

Diffstat:
M
pkgs/default.nix
 | 
4
++--
M
pkgs/misc/bwh/default.nix
 | 
14
++++++++------
M
pkgs/misc/pvs-studio/default.nix
 | 
6
+++---

3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -324,8 +324,8 @@ lib.makeScope newScope (
     ascii-dash = callPackage ./misc/ascii-dash { };
     bash-completor = callPackage ./misc/bash-completor { };
     btpd = callPackage ./misc/btpd { };
-    bwh = callPackage ./misc/bwh {
-      inherit (darwin.apple_sdk.frameworks) AppKit;
+    bwh = darwin.apple_sdk_11_0.callPackage ./misc/bwh {
+      inherit (darwin.apple_sdk_11_0.frameworks) AppKit;
     };
     cadzinho = callPackage ./misc/cadzinho {
       lua = pkgs.lua5_4;
diff --git a/pkgs/misc/bwh/default.nix b/pkgs/misc/bwh/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitea, cmake, pkg-config, SDL2, the-foundation, AppKit }:
+{ lib, stdenv, fetchFromGitea, cmake, pkg-config, makeWrapper, SDL2, the-foundation, AppKit }:
 
 stdenv.mkDerivation rec {
   pname = "bwh";
@@ -12,13 +12,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-POKjvUGFS3urc1aqOvfCAApUnRxoZhU725eYRAS4Z2w=";
   };
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  nativeBuildInputs = [ cmake pkg-config makeWrapper ];
 
   buildInputs = [ SDL2 the-foundation ] ++ lib.optional stdenv.isDarwin AppKit;
 
-  #cmakeFlags = [
-  #  (lib.cmakeFeature "the_Foundation_DIR" "${the-foundation}/lib/cmake/the_Foundation")
-  #];
+  installPhase = lib.optionalString stdenv.isDarwin ''
+    mkdir -p $out/{Applications,bin}
+    mv *.app $out/Applications
+    makeWrapper $out/{Applications/Bitwise\ Harmony.app/Contents/MacOS/Bitwise\ Harmony,bin/bitwise-harmony}
+  '';
 
   meta = with lib; {
     description = "Bitwise Harmony - simple synth tracker";
@@ -26,6 +28,6 @@ stdenv.mkDerivation rec {
     license = licenses.bsd2;
     maintainers = with maintainers; [ sikmir ];
     platforms = platforms.unix;
-    broken = stdenv.isDarwin; # AppKit 10.15 required
+    mainProgram = "bitwise-harmony";
   };
 }
diff --git a/pkgs/misc/pvs-studio/default.nix b/pkgs/misc/pvs-studio/default.nix
@@ -10,13 +10,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "pvs-studio";
-  version = "7.25.72091.324";
+  version = "7.27.75620.346";
 
   src = fetchurl {
     url = "https://cdn.pvs-studio.com/pvs-studio-${finalAttrs.version}-${suffix}.tgz";
     hash = {
-      x86_64-linux = "sha256-Kw6d1rpFspPiWFvcWGXdzSx9lcmCcXUkT6PBA87/B/c=";
-      x86_64-darwin = "sha256-f7Gi0dRMcox+4x9FWMdL/ucmKT3DpPpFDQm8HLVRtY8=";
+      x86_64-linux = "sha256-Jno4bnrgV4VS86sd2LcPJtGn7qo80mCA1htpiuFf/eQ=";
+      x86_64-darwin = "sha256-T8i+slwpOOPKCLlZ0inz3WSAQNytZrysBGv5FA0IkqE=";
     }.${system} or throwSystem;
   };