public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wxGTK-2.x: enable support for media control

Browse Source 
svn path=/nixpkgs/trunk/; revision=31516
This commit is contained in:
Peter Simons 2012-01-13 10:32:02 +00:00
parent 6284c83b15
commit dd90ec0d92
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/wxGTK-2.8/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, gstreamer, gstPluginsBase, GConf
, mesa, compat24 ? false, compat26 ? true, unicode ? true, , mesa, compat24 ? false, compat26 ? true, unicode ? true,
}: }:
@ -10,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk"; sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk";
}; };
buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ]; buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa gstreamer gstPluginsBase GConf ];
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];
@ -21,6 +22,7 @@ stdenv.mkDerivation {
"--disable-precomp-headers" "--disable-precomp-headers"
(if unicode then "--enable-unicode" else "") (if unicode then "--enable-unicode" else "")
"--with-opengl" "--with-opengl"
"--enable-mediactrl"
]; ];
# This variable is used by configure to find some dependencies. # This variable is used by configure to find some dependencies.

4
pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, gstreamer, gstPluginsBase, GConf
, mesa, compat24 ? false, compat26 ? true, unicode ? true, , mesa, compat24 ? false, compat26 ? true, unicode ? true,
}: }:
@ -10,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc"; sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc";
}; };
buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ]; buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa gstreamer gstPluginsBase GConf ];
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];
@ -21,6 +22,7 @@ stdenv.mkDerivation {
"--disable-precomp-headers" "--disable-precomp-headers"
(if unicode then "--enable-unicode" else "") (if unicode then "--enable-unicode" else "")
"--with-opengl" "--with-opengl"
"--enable-mediactrl"
]; ];
SEARCH_LIB = "${mesa}/lib"; SEARCH_LIB = "${mesa}/lib";

4
pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, gstreamer, gstPluginsBase, GConf
, mesa, compat24 ? false, compat26 ? true, unicode ? true, , mesa, compat24 ? false, compat26 ? true, unicode ? true,
}: }:
@ -10,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8"; sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8";
}; };
buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ]; buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa gstreamer gstPluginsBase GConf ];
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];
@ -21,6 +22,7 @@ stdenv.mkDerivation {
"--disable-precomp-headers" "--disable-precomp-headers"
(if unicode then "--enable-unicode" else "") (if unicode then "--enable-unicode" else "")
"--with-opengl" "--with-opengl"
"--enable-mediactrl"
]; ];
SEARCH_LIB = "${mesa}/lib"; SEARCH_LIB = "${mesa}/lib";

6
pkgs/top-level/all-packages.nix
View File

@ -4684,14 +4684,20 @@ let
wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 { wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 {
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (gst_all) gstreamer gstPluginsBase;
inherit (gnome) GConf;
}; };
wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix { wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix {
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (gst_all) gstreamer gstPluginsBase;
inherit (gnome) GConf;
}; };
wxGTK291 = callPackage ../development/libraries/wxGTK-2.9/2.9.1.nix { wxGTK291 = callPackage ../development/libraries/wxGTK-2.9/2.9.1.nix {
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (gst_all) gstreamer gstPluginsBase;
inherit (gnome) GConf;
}; };
wtk = callPackage ../development/libraries/wtk { }; wtk = callPackage ../development/libraries/wtk { };