From 470a4b15e17bb057117febe3bb48776c861ef1b1 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Wed, 23 Mar 2022 20:10:51 -0700 Subject: [PATCH] pulseaudio-hsphfpd: drop --- pkgs/servers/pulseaudio/correct-ldflags.patch | 13 -- pkgs/servers/pulseaudio/pali.nix | 219 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 4 files changed, 1 insertion(+), 236 deletions(-) delete mode 100644 pkgs/servers/pulseaudio/correct-ldflags.patch delete mode 100644 pkgs/servers/pulseaudio/pali.nix diff --git a/pkgs/servers/pulseaudio/correct-ldflags.patch b/pkgs/servers/pulseaudio/correct-ldflags.patch deleted file mode 100644 index 174cb8b4f746..000000000000 --- a/pkgs/servers/pulseaudio/correct-ldflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 45df103f0..d57d13172 100644 ---- a/meson.build -+++ b/meson.build -@@ -342,7 +342,7 @@ cdata.set('MESON_BUILD', 1) - # On ELF systems we don't want the libraries to be unloaded since we don't clean them up properly, - # so we request the nodelete flag to be enabled. - # On other systems, we don't really know how to do that, but it's welcome if somebody can tell. --nodelete_link_args = ['-Wl,-z,nodelete'] -+nodelete_link_args = cc.get_supported_link_arguments(['-Wl,-z,nodelete']) - - # Code coverage - diff --git a/pkgs/servers/pulseaudio/pali.nix b/pkgs/servers/pulseaudio/pali.nix deleted file mode 100644 index b07c2fd4ac70..000000000000 --- a/pkgs/servers/pulseaudio/pali.nix +++ /dev/null @@ -1,219 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchFromGitLab -, meson -, ninja -, pkg-config -, libsndfile -, libtool -, makeWrapper -, perlPackages -, xorg -, libcap -, alsa-lib -, glib -, dconf -, avahi -, libjack2 -, libasyncns -, lirc -, dbus -, sbc -, bluez5 -, udev -, openssl -, fftwFloat -, soxr -, speexdsp -, systemd -, webrtc-audio-processing -, gtk3 -, tdb -, orc -, check -, gettext -, gst_all_1 -, libopenaptx - -, x11Support ? true - -, # Whether to support the JACK sound system as a backend. - jackaudioSupport ? false - -, airtunesSupport ? true - -, bluetoothSupport ? true - -, remoteControlSupport ? true - -, zeroconfSupport ? true - -, # Whether to build only the library. - libOnly ? false - -# Building from Git source -, fromGit ? true - -, CoreServices -, AudioUnit -, Cocoa -}: - -stdenv.mkDerivation rec { - pname = "${if libOnly then "lib" else ""}pulseaudio-hsphfpd"; - version = "13.99.2"; - - outputs = [ "out" "dev" ]; - - # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/288 - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "pali"; - repo = "pulseaudio"; - rev = "5336b39e7e03cf50386e719e287a712b59730eb8"; - sha256 = "0vc0i5rzkns3xw6y2q0c94p2qdi5k3mgjvhicgq1b0py2qxmji16"; - }; - - patches = [ - ./add-option-for-installation-sysconfdir.patch - ./correct-ldflags.patch - ]; - - # Says it should be v${version} but it's parsing logic is broken - preConfigure = lib.optionalString fromGit '' - sed -i "s@version : run_command.*@version: '${version}',@" meson.build - ''; - - nativeBuildInputs = [ - gettext - makeWrapper - meson - ninja - pkg-config - perlPackages.perl - perlPackages.XMLParser - ]; - - checkInputs = [ - check - ]; - - propagatedBuildInputs = lib.optional stdenv.isLinux libcap; - - buildInputs = [ - libopenaptx - fftwFloat - libsndfile - libtool - orc - soxr - speexdsp - tdb - sbc - gst_all_1.gst-plugins-base - ] ++ lib.optionals bluetoothSupport [ - bluez5 - ] ++ lib.optionals stdenv.isLinux [ - dbus - glib - gtk3 - libasyncns - ] ++ lib.optionals stdenv.isDarwin [ - AudioUnit - Cocoa - CoreServices - ] ++ lib.optionals (!libOnly) ( - lib.optionals x11Support [ - xorg.libXi - xorg.libXtst - xorg.xlibsWrapper - ] ++ lib.optionals stdenv.isLinux [ - alsa-lib - systemd - udev - ] ++ lib.optional airtunesSupport openssl - ++ lib.optional jackaudioSupport libjack2 - ++ lib.optional remoteControlSupport lirc - ++ lib.optional zeroconfSupport avahi - ++ [ webrtc-audio-processing ] - ); - - mesonFlags = [ - "--localstatedir=/var" - "--sysconfdir=/etc" - "-Daccess_group=audio" - "-Dbashcompletiondir=${placeholder "out"}/share/bash-completions/completions" - "-Dman=false" # TODO: needs xmltoman; also doesn't check for this - "-Dsysconfdir_install=${placeholder "out"}/etc" - "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" - "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" - "-Dzshcompletiondir=${placeholder "out"}/share/zsh/site-functions" - ] ++ lib.optionals (!stdenv.isLinux) [ - "-Dasyncns=disabled" - "-Ddbus=disabled" - "-Dglib=disabled" - "-Dgsettings=disabled" - "-Dgtk=disabled" - ] ++ lib.optionals (!stdenv.isLinux || libOnly) [ - "-Dalsa=disabled" - "-Dsystemd=disabled" - "-Dudev=disabled" - ] ++ lib.optional libOnly "-Dwebrtc-aec=disabled" - ++ lib.optional (!x11Support) "-Dx11=disabled" - ++ lib.optional (!bluetoothSupport) "-Dbluez5=false" - ++ lib.optional (!airtunesSupport) "-Dopenssl=disabled" - ++ lib.optional (!jackaudioSupport) "-Djack=disabled" - ++ lib.optional (!remoteControlSupport) "-Dlirc=disabled" - ++ lib.optional (!zeroconfSupport) "-Davahi=disabled" - ++ lib.optional (!doCheck) "-Dtests=false"; - - # To create ~/.config/pulse - preCheck = '' - export HOME=$(mktemp -d) - ''; - - doCheck = true; - - # not sure what the best practices are here -- can't seem to find a way - # for the compiler to bring in stdlib and stdio (etc.) properly - # the alternative is to copy the files from /usr/include to src, but there are - # probably a large number of files that would need to be copied (I stopped - # after the seventh) - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I/usr/include"; - - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreServices -framework Cocoa -framework AudioUnit"; - - postInstall = '' - moveToOutput lib/cmake "$dev" - rm -f $out/bin/qpaeq # this is packaged by the "qpaeq" package now, because of missing deps - '' + lib.optionalString libOnly '' - rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}} - ''; - - preFixup = lib.optionalString (stdenv.isLinux && !libOnly) '' - wrapProgram $out/libexec/pulse/gsettings-helper \ - --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${pname}-${version}" \ - --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" - ''; - - passthru = { - pulseDir = "lib/pulse-" + lib.versions.majorMinor version; - }; - - meta = with lib; { - description = "A featureful, general-purpose sound server"; - homepage = "http://www.pulseaudio.org/"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - longDescription = '' - PulseAudio is a sound system for POSIX OSes, meaning that it is - a proxy for your sound applications. It allows you to do advanced - operations on your sound data as it passes between your application - and your hardware. Things like transferring the audio to a different machine, - changing the sample format or channel count and mixing several sounds into one - are easily achieved using a sound server. - ''; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6440c76166d2..267e0e8e128c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -963,6 +963,7 @@ mapAliases ({ proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30 proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead"; # Added 2021-04-12 prometheus-cups-exporter = throw "outdated and broken by design; removed by developer"; # Added 2021-03-16 + pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23 pulseaudioLight = throw "'pulseaudioLight' has been renamed to/replaced by 'pulseaudio'"; # Converted to throw 2022-02-22 pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire"; # Added 2021-02-13 pulseeffects-pw = easyeffects; # Added 2021-07-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 156a8c9d2cfb..a1d49a92aaec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21823,10 +21823,6 @@ with pkgs; hsphfpd = callPackage ../servers/pulseaudio/hsphfpd.nix { }; - pulseaudio-hsphfpd = callPackage ../servers/pulseaudio/pali.nix { - inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; - }; - pulseaudio = callPackage ../servers/pulseaudio ({ inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; });