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

wxGTK3*: switch to gstreamer 1.x

Browse Source 
Configure log still prints `checking for GST... yes`
and the new GST libs appear in RPATH.
wxGTK28 does't seem able to configure with non-legacy GST,
but it's almost unused... so I didn't touch it.
This commit is contained in:
Vladimír Čunát 2020-07-04 17:31:18 +02:00
parent 704e9e9b24
commit 92b7ce99f7
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/wxwidgets/3.0/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig { stdenv, fetchFromGitHub, fetchurl, pkgconfig
, libXinerama, libSM, libXxf86vm , libXinerama, libSM, libXxf86vm
, gtk2, GConf ? null, gtk3 , gtk2, GConf ? null, gtk3
, xorgproto, gstreamer, gst-plugins-base, setfile , xorgproto, gst_all_1, setfile
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, withMesa ? libGLSupported , withMesa ? libGLSupported
, libGLU ? null, libGL ? null , libGLU ? null, libGL ? null
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base
] ++ optionals withGtk2 [ gtk2 GConf ] ] ++ optionals withGtk2 [ gtk2 GConf ]
++ optional (!withGtk2) gtk3 ++ optional (!withGtk2) gtk3
++ optional withMesa libGLU ++ optional withMesa libGLU

4
pkgs/development/libraries/wxwidgets/3.1/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig { stdenv, fetchFromGitHub, fetchurl, pkgconfig
, libXinerama, libSM, libXxf86vm , libXinerama, libSM, libXxf86vm
, gtk2, GConf ? null, gtk3 , gtk2, GConf ? null, gtk3
, xorgproto, gstreamer, gst-plugins-base, setfile , xorgproto, gst_all_1, setfile
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, withMesa ? libGLSupported, libGLU ? null, libGL ? null , withMesa ? libGLSupported, libGLU ? null, libGL ? null
, compat28 ? false, compat30 ? true, unicode ? true , compat28 ? false, compat30 ? true, unicode ? true
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base
] ++ optionals withGtk2 [ gtk2 GConf ] ] ++ optionals withGtk2 [ gtk2 GConf ]
++ optional (!withGtk2) gtk3 ++ optional (!withGtk2) gtk3
++ optional withMesa libGLU ++ optional withMesa libGLU