nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-08 19:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #189591 from K900/pipewire-0.3.57

Browse Source
This commit is contained in:
Martin Weinelt 2022-09-13 22:17:14 +02:00 committed by GitHub
commit dddd763a56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/libcamera/default.nix
View File

@ -5,8 +5,6 @@
, ninja , ninja
, pkg-config , pkg-config
, makeFontsConf , makeFontsConf
, boost
, gnutls
, openssl , openssl
, libdrm , libdrm
, libevent , libevent
@ -23,12 +21,12 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "libcamera"; pname = "libcamera";
version = "unstable-2022-07-15"; version = "unstable-2022-09-03";
src = fetchgit { src = fetchgit {
url = "https://git.libcamera.org/libcamera/libcamera.git"; url = "https://git.libcamera.org/libcamera/libcamera.git";
rev = "e9b6b362820338d0546563444e7b1767f5c7044c"; rev = "f1776100f55e70320a8938586bc8bf2f242addd4";
hash = "sha256-geqFcMBHcVe7dPdVOal8V2pVItYUdoC+5isISqRG4Wc="; hash = "sha256-96AMemH+mSyPE26eiucwqUGYbK5uWNDNDgwAyeIAg6g=";
}; };
postPatch = '' postPatch = ''
@ -39,8 +37,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
# IPA and signing # IPA and signing
gnutls openssl
boost
# gstreamer integration # gstreamer integration
gst_all_1.gstreamer gst_all_1.gstreamer

7
pkgs/development/libraries/pipewire/default.nix
View File

@ -46,6 +46,7 @@
, libfreeaptx , libfreeaptx
, ldacbt , ldacbt
, fdk_aac , fdk_aac
, libopus
, nativeHspSupport ? true , nativeHspSupport ? true
, nativeHfpSupport ? true , nativeHfpSupport ? true
, ofonoSupport ? true , ofonoSupport ? true
@ -69,7 +70,7 @@ let
self = stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
pname = "pipewire"; pname = "pipewire";
version = "0.3.56"; version = "0.3.57";
outputs = [ outputs = [
"out" "out"
@ -87,7 +88,7 @@ let
owner = "pipewire"; owner = "pipewire";
repo = "pipewire"; repo = "pipewire";
rev = version; rev = version;
sha256 = "sha256-wbHHr7BW8Gdj9D1IjzOuD6VuXApJ5E0Zde2iKWImzxg="; sha256 = "sha256-s38ob78XsPwQVUQ/8y8JOJTbGaceBHeL5v7oryAQhuY=";
}; };
patches = [ patches = [
@ -133,7 +134,7 @@ let
++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ]
++ lib.optionals libcameraSupport [ libcamera libdrm ] ++ lib.optionals libcameraSupport [ libcamera libdrm ]
++ lib.optional ffmpegSupport ffmpeg ++ lib.optional ffmpegSupport ffmpeg
++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt sbc fdk_aac ] ++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt sbc fdk_aac libopus ]
++ lib.optional pulseTunnelSupport libpulseaudio ++ lib.optional pulseTunnelSupport libpulseaudio
++ lib.optional zeroconfSupport avahi ++ lib.optional zeroconfSupport avahi
++ lib.optional raopSupport openssl ++ lib.optional raopSupport openssl