Author: simons
Date: Fri Jan 13 10:32:02 2012
New Revision: 31516
URL: https://nixos.org/websvn/nix/?rev=31516&sc=1
Log:
wxGTK-2.x: enable support for media control
Modified:
nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.8/default.nix
nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.8/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.8/default.nix Fri Jan
13 10:31:58 2012 (r31515)
+++ nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.8/default.nix Fri Jan
13 10:32:02 2012 (r31516)
@@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm,
xf86vidmodeproto
+, gstreamer, gstPluginsBase, GConf
, mesa, compat24 ? false, compat26 ? true, unicode ? true,
}:
@@ -10,7 +11,7 @@
sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk";
};
- buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
+ buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa
gstreamer gstPluginsBase GConf ];
buildNativeInputs = [ pkgconfig ];
@@ -21,6 +22,7 @@
"--disable-precomp-headers"
(if unicode then "--enable-unicode" else "")
"--with-opengl"
+ "--enable-mediactrl"
];
# This variable is used by configure to find some dependencies.
Modified: nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix Fri Jan
13 10:31:58 2012 (r31515)
+++ nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix Fri Jan
13 10:32:02 2012 (r31516)
@@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm,
xf86vidmodeproto
+, gstreamer, gstPluginsBase, GConf
, mesa, compat24 ? false, compat26 ? true, unicode ? true,
}:
@@ -10,7 +11,7 @@
sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc";
};
- buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
+ buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa
gstreamer gstPluginsBase GConf ];
buildNativeInputs = [ pkgconfig ];
@@ -21,6 +22,7 @@
"--disable-precomp-headers"
(if unicode then "--enable-unicode" else "")
"--with-opengl"
+ "--enable-mediactrl"
];
SEARCH_LIB = "${mesa}/lib";
Modified: nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix Fri Jan
13 10:31:58 2012 (r31515)
+++ nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix Fri Jan
13 10:32:02 2012 (r31516)
@@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm,
xf86vidmodeproto
+, gstreamer, gstPluginsBase, GConf
, mesa, compat24 ? false, compat26 ? true, unicode ? true,
}:
@@ -10,7 +11,7 @@
sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8";
};
- buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
+ buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa
gstreamer gstPluginsBase GConf ];
buildNativeInputs = [ pkgconfig ];
@@ -21,6 +22,7 @@
"--disable-precomp-headers"
(if unicode then "--enable-unicode" else "")
"--with-opengl"
+ "--enable-mediactrl"
];
SEARCH_LIB = "${mesa}/lib";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jan 13 10:31:58
2012 (r31515)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jan 13 10:32:02
2012 (r31516)
@@ -4684,14 +4684,20 @@
wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 {
inherit (gtkLibs) gtk;
+ inherit (gst_all) gstreamer gstPluginsBase;
+ inherit (gnome) GConf;
};
wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix {
inherit (gtkLibs) gtk;
+ inherit (gst_all) gstreamer gstPluginsBase;
+ inherit (gnome) GConf;
};
wxGTK291 = callPackage ../development/libraries/wxGTK-2.9/2.9.1.nix {
inherit (gtkLibs) gtk;
+ inherit (gst_all) gstreamer gstPluginsBase;
+ inherit (gnome) GConf;
};
wtk = callPackage ../development/libraries/wtk { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
