diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-08-03 04:55:30 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-08-03 04:55:30 +0000 |
| commit | fd557980cd49bd53bab257ac5860bf56e0bed3d6 (patch) | |
| tree | 75886633bf98b0b3a109b601034c0754956eed20 /pkgs | |
| parent | dee8937ae75434b7a7fe7c1acb916432c5de04f2 (diff) | |
| download | nixpkgs-fd557980cd49bd53bab257ac5860bf56e0bed3d6.tar nixpkgs-fd557980cd49bd53bab257ac5860bf56e0bed3d6.tar.gz nixpkgs-fd557980cd49bd53bab257ac5860bf56e0bed3d6.tar.bz2 nixpkgs-fd557980cd49bd53bab257ac5860bf56e0bed3d6.tar.lz nixpkgs-fd557980cd49bd53bab257ac5860bf56e0bed3d6.tar.xz nixpkgs-fd557980cd49bd53bab257ac5860bf56e0bed3d6.tar.zst nixpkgs-fd557980cd49bd53bab257ac5860bf56e0bed3d6.zip | |
Add libsoup as gstreamer dependency
svn path=/nixpkgs/trunk/; revision=16543
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gstreamer/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 2661f8caaa5..a765510e7c0 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -16,7 +16,7 @@ rec { inherit gstPluginsBase; inherit (args) fetchurl stdenv pkgconfig aalib cairo flac hal libjpeg zlib speex libpng libdv libcaca dbus libiec61883 - libavc1394 ladspaH taglib gdbm pulseaudio; + libavc1394 ladspaH taglib gdbm pulseaudio libsoup; }; gstFfmpeg = import ./gst-ffmpeg { diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix index b575c2536a1..8cb0f101728 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix @@ -1,6 +1,8 @@ { fetchurl, stdenv, pkgconfig, gstPluginsBase, aalib, cairo , flac , hal, libjpeg, zlib, speex, libpng, libdv, libcaca, dbus -, libiec61883, libavc1394, ladspaH, taglib, gdbm, pulseaudio }: +, libiec61883, libavc1394, ladspaH, taglib, gdbm, pulseaudio +, libsoup +}: stdenv.mkDerivation rec { name = "gst-plugins-good-0.10.14"; @@ -12,7 +14,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [gstPluginsBase aalib cairo flac hal libjpeg zlib speex libpng libdv libcaca dbus.libs libiec61883 libavc1394 ladspaH - taglib gdbm pulseaudio]; + taglib gdbm pulseaudio libsoup]; buildInputs = [pkgconfig]; configureFlags = "--enable-ladspa"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6f3b31b52f..a794a1dfdce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3155,6 +3155,7 @@ let inherit (gtkLibs) glib pango gtk; inherit (gnome) gnomevfs /* <- only passed for the no longer used older versions it is depreceated and didn't build on amd64 due to samba dependenccy */ gtkdoc; + inherit (gnome26) libsoup; }); gnet = import ../development/libraries/gnet { |