From 132162cb7ac45a060227613b030e0a4a476bb0a1 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 16 Feb 2024 15:55:18 +0100 Subject: [PATCH] ptcollab: 0.6.4.7 -> 0.6.4.8 --- .../pt/ptcollab/package.nix} | 28 +++++++++---------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 17 insertions(+), 15 deletions(-) rename pkgs/{applications/audio/ptcollab/default.nix => by-name/pt/ptcollab/package.nix} (74%) diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/by-name/pt/ptcollab/package.nix similarity index 74% rename from pkgs/applications/audio/ptcollab/default.nix rename to pkgs/by-name/pt/ptcollab/package.nix index ca98012c3ff5..f03d89e7c490 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/by-name/pt/ptcollab/package.nix @@ -1,40 +1,39 @@ -{ mkDerivation +{ stdenv , lib -, stdenv , fetchFromGitHub , nix-update-script +, libsForQt5 , libvorbis , pkg-config -, qmake -, qtbase -, qttools -, qtmultimedia , rtmidi }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ptcollab"; - version = "0.6.4.7"; + version = "0.6.4.8"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; - rev = "v${version}"; - hash = "sha256-KYNov/HbKM2d8VVO8iyWA3XWFDE9iWeKkRCNC1xlPNw="; + rev = "v${finalAttrs.version}"; + hash = "sha256-9u2K79QJRfYKL66e1lsRrQMEqmKTWbK+ucal3/u4rP4="; }; nativeBuildInputs = [ pkg-config + ] ++ (with libsForQt5; [ qmake qttools - ]; + wrapQtAppsHook + ]); buildInputs = [ libvorbis + rtmidi + ] ++ (with libsForQt5; [ qtbase qtmultimedia - rtmidi - ]; + ]); postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # Move appbundles to Applications before wrapping happens @@ -54,8 +53,9 @@ mkDerivation rec { meta = with lib; { description = "Experimental pxtone editor where you can collaborate with friends"; homepage = "https://yuxshao.github.io/ptcollab/"; + changelog = "https://github.com/yuxshao/ptcollab/releases/tag/v${finalAttrs.version}"; license = licenses.mit; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3023859f6f6..11581d2603d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30326,7 +30326,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio Foundation; }; - ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; + ptcollab = callPackage ../by-name/pt/ptcollab/package.nix { + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + }; schismtracker = callPackage ../applications/audio/schismtracker { inherit (darwin.apple_sdk.frameworks) Cocoa;