From dc2b9778ad88d452d05d904f289c193bed657915 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Tue, 17 Jan 2023 17:42:43 -0800 Subject: [PATCH 1/2] maintainers: add PowerUser64 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5ebe9fdb6885..bd280cca232e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11419,6 +11419,12 @@ githubId = 146413; name = "Tobias Poschwatta"; }; + PowerUser64 = { + email = "blakelysnorth@gmail.com"; + github = "PowerUser64"; + githubId = 24578572; + name = "Blake North"; + }; ppenguin = { name = "Jeroen Versteeg"; email = "hieronymusv@gmail.com"; From 57221929c932530aba1c48dbb689d80767bca958 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Tue, 17 Jan 2023 17:06:13 -0800 Subject: [PATCH 2/2] sonobus: init at 1.6.2 Co-authored-by: tobiasBora sonobus: add meta sonobus: remove tree dependency (left from debug) sonobus: rewrite comments sonobus: remove platform sonobus: apply suggestions from review Co-authored-by: Nikolay Korotkiy Co-authored-by: Matthias Thym sonobus: mark darwin as broken Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> sonobus: apply suggestions from code review Co-authored-by: Lily Foster sonobus: remove opusTools sonobus: 1.6.2 sonobus: change to autoPatchelfHook Co-authored-by: Lily Foster --- pkgs/applications/audio/sonobus/default.nix | 83 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 85 insertions(+) create mode 100644 pkgs/applications/audio/sonobus/default.nix diff --git a/pkgs/applications/audio/sonobus/default.nix b/pkgs/applications/audio/sonobus/default.nix new file mode 100644 index 000000000000..da82fcc5a86e --- /dev/null +++ b/pkgs/applications/audio/sonobus/default.nix @@ -0,0 +1,83 @@ +{ lib +, pkg-config +, stdenv +, fetchFromGitHub +, autoPatchelfHook +, alsa-lib +, cmake +, freetype +, libGL +, libX11 +, libXcursor +, libXext +, libXinerama +, libXrandr +, libjack2 +, libopus +, curl +, gtk3 +, webkitgtk +}: + +stdenv.mkDerivation rec { + pname = "sonobus"; + version = "1.6.2"; + + src = fetchFromGitHub { + owner = "sonosaurus"; + repo = "sonobus"; + rev = version; + sha256 = "sha256-/Pb+PYmoCYA6Qcy/tR1Ejyt+rZ3pfJeWV4j7bQWYE58="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + autoPatchelfHook + cmake + pkg-config + ]; + + buildInputs = [ + alsa-lib + freetype + libjack2 + libopus + curl + gtk3 + webkitgtk + ]; + + runtimeDependencies = [ + libGL + libX11 + libXcursor + libXext + libXinerama + libXrandr + ]; + + postPatch = lib.optionalString (stdenv.isLinux) '' + # needs special setup on Linux, dunno if it can work on Darwin + # https://github.com/NixOS/nixpkgs/issues/19098 + # Also, I get issues with linking without that, not sure why + sed -i -e '/juce::juce_recommended_lto_flags/d' CMakeLists.txt + patchShebangs linux/install.sh + ''; + + # The program does not provide any CMake install instructions + installPhase = lib.optionalString (stdenv.isLinux) '' + runHook preInstall + cd ../linux + ./install.sh "$out" + runHook postInstall + ''; + + meta = with lib; { + description = "High-quality network audio streaming"; + homepage = "https://sonobus.net/"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ PowerUser64 ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8a6ab5623c8..84c5fcfe04c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29842,6 +29842,8 @@ with pkgs; sonixd = callPackage ../applications/audio/sonixd { }; + sonobus = callPackage ../applications/audio/sonobus { }; + sosreport = python3Packages.callPackage ../applications/logging/sosreport { }; spectmorph = callPackage ../applications/audio/spectmorph { };