Merge pull request #192769 from romildo/fix.gstreamermm
gst_all_1.gstreamermm: fix build against glib 2.68
This commit is contained in:
commit
b3695cb666
|
@ -1,4 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, file
|
||||
, glibmm
|
||||
, gst_all_1
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gstreamermm";
|
||||
version = "1.10.0";
|
||||
|
@ -8,11 +18,25 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0q4dx9sncqbwgpzma0zvj6zssc279yl80pn8irb95qypyyggwn5y";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "${pname}-${version}.fix-build-against-glib-2.68.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/gstreamermm/-/commit/37116547fb5f9066978e39b4cf9f79f2154ad425.patch";
|
||||
sha256 = "sha256-YHtmOiOl4POwas3eWHsew3IyGK7Aq22MweBm3JPwyBM=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config file ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
file
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ glibmm gst_all_1.gst-plugins-base ];
|
||||
propagatedBuildInputs = [
|
||||
glibmm
|
||||
gst_all_1.gst-plugins-base
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
@ -30,11 +54,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
broken = true; # at 2022-09-24, logs at: https://termbin.com/n5hb
|
||||
# ../gstreamer/gstreamermm/register.h: In function 'GType Gst::register_mm_type(const gchar*)':
|
||||
# /nix/store/rwr0ly4girpnrq3sqvp3v2k40wb4hh3s-glib-2.72.3-dev/include/glib-2.0/glib/gatomic.h:113:19:
|
||||
# error: argument 2 of '__atomic_load' must not be a pointer to a 'volatile' type
|
||||
# 113 | __atomic_load (gapg_temp_atomic, &gapg_temp_newval, __ATOMIC_SEQ_CST);
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue