ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 13:37:21 +03:00
Code Issues Projects Releases Wiki Activity

qt48, gstreamer: attempt to fix on non-Linux

Browse Source
This commit is contained in:
Vladimír Čunát 2013-06-18 18:34:25 +02:00
parent 3adf8e6429
commit 92ecf99373
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gstreamer/gstreamer/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2 }:
{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2, libintlOrEmpty }:
stdenv.mkDerivation rec {
name = "gstreamer-0.10.36";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ perl bison flex pkgconfig ];
propagatedBuildInputs = [ glib libxml2 ];
propagatedBuildInputs = [ glib libxml2 ] ++ libintlOrEmpty;
patchPhase = ''
sed -i -e 's/^ /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in

2
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
libXv libXi libSM
]
++ optional (stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms) mesa
++ optional (buildWebkit || buildMultimedia) alsaLib
++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib
++ [ zlib libpng openssl dbus.libs freetype fontconfig glib ]
++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst_plugins_base ];