diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-17 13:43:31 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-17 13:43:31 +0000 |
| commit | 79d0d410cb48eeffd542bc6a293e9dc347bafbda (patch) | |
| tree | c5078740bc6c2c844f6b38c701ad3d7a18fdb544 /pkgs/applications | |
| parent | e5027e5b365a91a7094ebae7875da6e6d31c211f (diff) | |
| parent | 882b8ea87107d36d143a38178b5e9b06800c204e (diff) | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/ufraw/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/linphone/default.nix | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 21d5c3ada8648..09dd51743fce1 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -2,12 +2,12 @@ , libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview }: stdenv.mkDerivation rec { - name = "ufraw-0.16"; + name = "ufraw-0.18"; src = fetchurl { # XXX: These guys appear to mutate uploaded tarballs! url = "mirror://sourceforge/ufraw/${name}.tar.gz"; - sha256 = "06fzyd7wyv5ixbmhbsz80pphhbic18d1w8ji0gz38aq1vdmgxw9n"; + sha256 = "01cjdc748vamjpaw2sbm8a9kwmb2hry4f200j3hlvqg9c6f77zi4"; }; buildInputs = diff --git a/pkgs/applications/networking/linphone/default.nix b/pkgs/applications/networking/linphone/default.nix index c98a8ae4fd90e..04e119afdb142 100644 --- a/pkgs/applications/networking/linphone/default.nix +++ b/pkgs/applications/networking/linphone/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip, speex, - readline, ffmpeg, alsaLib, SDL, libv4l, libtheora, libXv }: +{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip +, speex, readline, mediastreamer }: stdenv.mkDerivation rec { name = "linphone-3.5.0"; @@ -9,14 +9,16 @@ stdenv.mkDerivation rec { sha256 = "1jrgsyx2mn6y50hjfx79fzqhp42r78cjr63w3bfjdl258zy2f6ix"; }; - buildInputs = [ intltool gtk libglade libosip libexosip speex readline - ffmpeg alsaLib SDL libv4l libtheora libXv ]; + buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex ]; - buildNativeInputs = [ pkgconfig ]; + buildNativeInputs = [ intltool pkgconfig ]; + + configureFlags = "--enable-external-ortp --enable-external-mediastreamer"; meta = { homepage = http://www.linphone.org/; description = "Open Source video SIP softphone"; license = "GPLv2+"; + platforms = stdenv.lib.platforms.gnu; }; } |