diff options
| author | OPNA2608 <christoph.neidahl@gmail.com> | 2023-02-06 17:40:45 +0100 |
|---|---|---|
| committer | OPNA2608 <christoph.neidahl@gmail.com> | 2023-02-06 17:40:45 +0100 |
| commit | 610af7778b04ebfe3c8ed715cc2b77af30c17304 (patch) | |
| tree | 650f94d5503e3014359388c9d52289960cddc05d | |
| parent | 42b3a6354fde25436733f56eebcd17d3fdf857a3 (diff) | |
| download | nixpkgs-610af7778b04ebfe3c8ed715cc2b77af30c17304.tar nixpkgs-610af7778b04ebfe3c8ed715cc2b77af30c17304.tar.gz nixpkgs-610af7778b04ebfe3c8ed715cc2b77af30c17304.tar.bz2 nixpkgs-610af7778b04ebfe3c8ed715cc2b77af30c17304.tar.lz nixpkgs-610af7778b04ebfe3c8ed715cc2b77af30c17304.tar.xz nixpkgs-610af7778b04ebfe3c8ed715cc2b77af30c17304.tar.zst nixpkgs-610af7778b04ebfe3c8ed715cc2b77af30c17304.zip | |
bambootracker: 0.6.0 -> 0.6.1
| -rw-r--r-- | pkgs/applications/audio/bambootracker/default.nix | 36 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 32 insertions, 11 deletions
diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 08e34791192..d636d03eb00 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -1,39 +1,55 @@ -{ mkDerivation -, stdenv +{ stdenv , lib , fetchFromGitHub -, qmake , pkg-config -, qttools +, qmake , qtbase +, qttools , rtaudio , rtmidi +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "bambootracker"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-yubaKTc8NFLxMY0/5c2VubRHgAGOsRlitmXJ1UHzl60="; + hash = "sha256-Ymi1tjJCgStF0Rtseelq/YuTtBs2PrbF898TlbjyYUw="; }; - nativeBuildInputs = [ qmake qttools pkg-config ]; + nativeBuildInputs = [ + pkg-config + qmake + qttools + wrapQtAppsHook + ]; - buildInputs = [ qtbase rtaudio rtmidi ]; + buildInputs = [ + qtbase + rtaudio + rtmidi + ]; - qmakeFlags = [ "CONFIG+=system_rtaudio" "CONFIG+=system_rtmidi" ]; + qmakeFlags = [ + "CONFIG+=system_rtaudio" + "CONFIG+=system_rtmidi" + ]; postConfigure = "make qmake_all"; + # Wrapping the inside of the app bundles, avoiding double-wrapping + dontWrapQtApps = stdenv.hostPlatform.isDarwin; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/{bin,Applications}/BambooTracker.app ln -s $out/{Applications/BambooTracker.app/Contents/MacOS,bin}/BambooTracker + wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29b02a714f1..9e46e142304 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28232,7 +28232,12 @@ with pkgs; azpainter = callPackage ../applications/graphics/azpainter { }; - bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; + bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { + stdenv = if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk_11_0.stdenv + else + stdenv; + }; blocky = callPackage ../applications/networking/blocky { }; |