Merge pull request #92261 from FRidh/gstreamer

gst-plugins-base: mark as broken
This commit is contained in:
Frederik Rietdijk 2020-07-04 18:12:08 +02:00 committed by GitHub
commit 9ffa14d581
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 6 deletions

View File

@ -56,5 +56,7 @@ stdenv.mkDerivation rec {
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
maintainers = with maintainers; [ lovek323 ]; maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix; platforms = platforms.unix;
# https://github.com/NixOS/nixpkgs/pull/91090#issuecomment-653753497
broken = true;
}; };
} }

View File

@ -3,8 +3,9 @@
, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
, libmng, which, libGLU, openssl, dbus, cups, pkgconfig , libmng, which, libGLU, openssl, dbus, cups, pkgconfig
, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base , buildMultimedia ? false # ancient gstreamer is broken
, buildWebkit ? (stdenv.isLinux || stdenv.isDarwin) , alsaLib, gstreamer, gst-plugins-base
, buildWebkit ? false
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, flashplayerFix ? false, gdk-pixbuf , flashplayerFix ? false, gdk-pixbuf
, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2 , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2

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

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