From 64c2db945d29aced2566d1dd0d8d62fb91950c99 Mon Sep 17 00:00:00 2001 From: deltadelta Date: Mon, 14 Feb 2022 19:07:54 +0100 Subject: dino: pass only required parts of gst_all_1 --- pkgs/applications/networking/instant-messengers/dino/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index b6e54bc30e85c..3e992899e43e7 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -13,7 +13,8 @@ , pcre , qrencode , icu -, gspell, srtp, libnice, gnutls, gst_all_1 +, gspell +, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good }: stdenv.mkDerivation rec { @@ -61,9 +62,9 @@ stdenv.mkDerivation rec { srtp libnice gnutls - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good + gstreamer + gst-plugins-base + gst-plugins-good ] ++ lib.optionals (!stdenv.isDarwin) [ xorg.libxcb xorg.libpthreadstubs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5598d98409d54..45976f1af1410 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2866,7 +2866,10 @@ with pkgs; ditaa = callPackage ../tools/graphics/ditaa { }; - dino = callPackage ../applications/networking/instant-messengers/dino { }; + dino = callPackage ../applications/networking/instant-messengers/dino { + inherit (gst_all_1) gstreamer gst-plugins-base; + gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; + }; djv = callPackage ../applications/graphics/djv { }; -- cgit 1.4.1