From 4d10ab62ebe2ea5497dbd97482e1c8c6b8361a0b Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Tue, 13 Jan 2026 15:33:52 +0100 Subject: [PATCH] farstream: move to pkgs/by-name this shouldn't create any rebuilds --- .../default.nix => by-name/fa/farstream/package.nix} | 12 ++++-------- pkgs/top-level/all-packages.nix | 11 ----------- 2 files changed, 4 insertions(+), 19 deletions(-) rename pkgs/{development/libraries/farstream/default.nix => by-name/fa/farstream/package.nix} (88%) diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/by-name/fa/farstream/package.nix similarity index 88% rename from pkgs/development/libraries/farstream/default.nix rename to pkgs/by-name/fa/farstream/package.nix index d1432913b256..43549ba0b0c9 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/by-name/fa/farstream/package.nix @@ -3,16 +3,12 @@ stdenv, fetchurl, fetchpatch, + buildPackages, libnice, pkg-config, - autoreconfHook, - gstreamer, - gst-plugins-base, + gst_all_1, gupnp-igd, gobject-introspection, - gst-plugins-good, - gst-plugins-bad, - gst-libav, python3, }: @@ -46,12 +42,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - autoreconfHook + buildPackages.autoreconfHook269 gobject-introspection python3 ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ade9c35105b..aca1dd68fcb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6719,17 +6719,6 @@ with pkgs; factor-lang-0_101 = factorPackages-0_101.factor-lang; factor-lang = factor-lang-0_101; - farstream = callPackage ../development/libraries/farstream { - inherit (gst_all_1) - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad - gst-libav - ; - autoreconfHook = buildPackages.autoreconfHook269; - }; - inherit (callPackage ../development/libraries/ffmpeg { }) ffmpeg_4 ffmpeg_4-headless