From 15eebef4e85dfc451537bc0814faf0def3db29be Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 23 Oct 2014 03:10:17 +0400 Subject: [PATCH 1/3] gst-plugins-good: add minimized version --- .../gstreamer/legacy/gst-plugins-good/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index a0cd0a4c646f..c3d2d7016daf 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -2,6 +2,9 @@ , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx , libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc , glib, gstreamer, bzip2 +, # Whether to build no plugins that have external dependencies + # (except the PulseAudio plugin). + minimalDeps ? false }: stdenv.mkDerivation rec { @@ -20,10 +23,10 @@ stdenv.mkDerivation rec { configureFlags = "--disable-oss"; buildInputs = - [ pkgconfig glib gstreamer gst_plugins_base libavc1394 libiec61883 - aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex - taglib bzip2 libvpx gdk_pixbuf orc - ]; + [ pkgconfig glib gstreamer gst_plugins_base pulseaudio ] + ++ stdenv.lib.optionals (!minimalDeps) + [ aalib libcaca cairo libdv flac libjpeg libpng speex + taglib bzip2 libvpx gdk_pixbuf orc ]; enableParallelBuilding = true; From 333ccae68fae07d71b52fafe5a4d2e8033e8fff5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 23 Oct 2014 03:13:09 +0400 Subject: [PATCH 2/3] xfce: add config into scope --- pkgs/desktops/xfce/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index ae6b1a88a14d..d46c21d4e558 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -1,4 +1,4 @@ -{ pkgs, newScope }: let +{ config, pkgs, newScope }: let callPackage = newScope (deps // xfce_self); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eadaf4a3d9d1..d0f30d72aa76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11555,7 +11555,7 @@ let mate-themes = callPackage ../misc/themes/mate-themes { }; xfce = xfce4_10; - xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; }); + xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; }); ### SCIENCE From d771822d5f7d2f5e8d5d1485ee1646b3a0fd733e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 23 Oct 2014 03:12:45 +0400 Subject: [PATCH 3/3] xfce4-mixer: add pulseaudio support --- pkgs/desktops/xfce/applications/xfce4-mixer.nix | 10 +++++++--- pkgs/desktops/xfce/default.nix | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix index d9be20150b86..78c37771811b 100644 --- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix +++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, makeWrapper , glib, gstreamer, gst_plugins_base, gtk , libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null +, pulseaudioSupport ? false, gst_plugins_good }: let @@ -9,7 +10,10 @@ let gst_plugins_minimal = gst_plugins_base.override { minimalDeps = true; }; - gst_plugins = [ gst_plugins_minimal ]; + gst_plugins_pulse = gst_plugins_good.override { + minimalDeps = true; + }; + gst_plugins = [ gst_plugins_minimal ] ++ stdenv.lib.optional pulseaudioSupport gst_plugins_pulse; in @@ -25,9 +29,9 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = - [ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk + [ pkgconfig intltool glib gstreamer gtk libxfce4util libxfce4ui xfce4panel xfconf libunique makeWrapper - ]; + ] ++ gst_plugins; postInstall = '' diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index d46c21d4e558..2d4ef5583480 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -44,7 +44,9 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od parole = callPackage ./applications/parole.nix { }; ristretto = callPackage ./applications/ristretto.nix { }; terminal = xfce4terminal; # it has changed its name - xfce4mixer = callPackage ./applications/xfce4-mixer.nix { }; + xfce4mixer = callPackage ./applications/xfce4-mixer.nix { + pulseaudioSupport = config.pulseaudio or false; + }; xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { }; xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { }; xfce4terminal = callPackage ./applications/terminal.nix { };