uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,43 @@
commit 56a60ee50122613d3a356ce74b4bd77b5e7be235
Author: Tim Kosse <tim.kosse@filezilla-project.org>
Date: Sat Aug 26 15:37:30 2017 +0200
If a wxTopLevelWindow has been instanced, but Create has not been called, calling Destroy on the window results in an assertion in Show(false), at least under wxGTK. Fix this by only hiding a top level window during destruction if it is actually shown.
diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index ef693690c5..8d07812031 100644
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -122,19 +122,21 @@ bool wxTopLevelWindowBase::Destroy()
// any more as no events will be sent to the hidden window and without idle
// events we won't prune wxPendingDelete list and the application won't
// terminate
- for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(),
- end = wxTopLevelWindows.end();
- i != end;
- ++i )
- {
- wxTopLevelWindow * const win = static_cast<wxTopLevelWindow *>(*i);
- if ( win != this && win->IsShown() )
+ if ( IsShown() ) {
+ for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(),
+ end = wxTopLevelWindows.end();
+ i != end;
+ ++i )
{
- // there remains at least one other visible TLW, we can hide this
- // one
- Hide();
+ wxTopLevelWindow * const win = static_cast<wxTopLevelWindow *>(*i);
+ if ( win != this && win->IsShown() )
+ {
+ // there remains at least one other visible TLW, we can hide this
+ // one
+ Hide();
- break;
+ break;
+ }
}
}

View file

@ -0,0 +1,115 @@
{ lib
, stdenv
, fetchurl
, cairo
, gtk2
, libGL
, libGLU
, libSM
, libX11
, libXinerama
, libXxf86vm
, pkg-config
, xorgproto
, compat24 ? false
, compat26 ? true
, unicode ? true
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
}:
stdenv.mkDerivation rec {
pname = "wxGTK";
version = "2.8.12.1";
src = fetchurl {
url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2";
hash = "sha256-Hz8VPZ8VBMbOLSxLI+lAuPWLgfTLo1zaGluzEUIkPNA=";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
cairo
gtk2
libSM
libX11
libXinerama
libXxf86vm
xorgproto
]
++ lib.optional withMesa libGLU;
configureFlags = [
"--enable-gtk2"
"--disable-precomp-headers"
"--enable-mediactrl"
"--enable-graphics_ctx"
(if compat24 then "--enable-compat24" else "--disable-compat24")
(if compat26 then "--enable-compat26" else "--disable-compat26")
]
++ lib.optional unicode "--enable-unicode"
++ lib.optional withMesa "--with-opengl";
hardeningDisable = [ "format" ];
# These variables are used by configure to find some dependencies.
SEARCH_INCLUDE =
"${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include";
SEARCH_LIB =
"${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib "
+ lib.optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib ";
# Work around a bug in configure.
NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1 -lX11 -lcairo -Wno-narrowing";
preConfigure = ''
substituteInPlace configure --replace \
'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
substituteInPlace configure --replace \
'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
substituteInPlace configure --replace \
/usr /no-such-path
'';
postBuild = ''
pushd contrib/src
make
popd
'';
postInstall = ''
pushd contrib/src
make install
popd
pushd $out/include
ln -s wx-*/* .
popd
'';
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://www.wxwidgets.org/";
description = "A Cross-Platform C++ GUI Library";
longDescription = ''
wxWidgets gives you a single, easy-to-use API for writing GUI applications
on multiple platforms that still utilize the native platform's controls
and utilities. Link with the appropriate library for your platform and
compiler, and your application will adopt the look and feel appropriate to
that platform. On top of great GUI functionality, wxWidgets gives you:
online help, network programming, streams, clipboard and drag and drop,
multithreading, image loading and saving in a variety of popular formats,
database support, HTML viewing and printing, and much more.
'';
license = licenses.wxWindows;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
passthru = {
inherit compat24 compat26 unicode;
gtk = gtk2;
};
}

View file

@ -0,0 +1,127 @@
{ lib
, stdenv
, fetchFromGitHub
, autoconf
, gtk2
, libGL
, libGLU
, libSM
, libXinerama
, libXxf86vm
, pkg-config
, xorgproto
, compat24 ? false
, compat26 ? true
, unicode ? true
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, AGL
, Carbon
, Cocoa
, Kernel
, QuickTime
, setfile
}:
stdenv.mkDerivation rec {
pname = "wxGTK";
version = "2.9.5";
src = fetchFromGitHub {
owner = "wxWidgets";
repo = "wxWidgets";
rev = "v${version}";
hash = "sha256-izefAPU4lORZxQja7/InHyElJ1++2lDloR+xPudsRNE=";
};
patches = [
# https://github.com/wxWidgets/wxWidgets/issues/17942
./patches/0001-fix-assertion-using-hide-in-destroy.patch
];
nativeBuildInputs = [
autoconf
pkg-config
];
buildInputs = [
gtk2
libSM
libXinerama
libXxf86vm
xorgproto
]
++ lib.optional withMesa libGLU
++ lib.optionals stdenv.isDarwin [
Carbon
Cocoa
Kernel
QuickTime
setfile
];
propagatedBuildInputs = lib.optional stdenv.isDarwin AGL;
configureFlags = [
"--disable-precomp-headers"
"--enable-gtk2"
(if compat24 then "--enable-compat24" else "--disable-compat24")
(if compat26 then "--enable-compat26" else "--disable-compat26")
]
++ lib.optional unicode "--enable-unicode"
++ lib.optional withMesa "--with-opengl"
++ lib.optionals stdenv.isDarwin [ # allow building on 64-bit
"--enable-universal-binaries"
"--with-cocoa"
"--with-macosx-version-min=10.7"
];
SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib ";
preConfigure = ''
./autogen.sh
substituteInPlace configure --replace \
'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
substituteInPlace configure --replace \
'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
substituteInPlace configure --replace \
/usr /no-such-path
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace \
'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
substituteInPlace configure --replace \
"-framework System" "-lSystem"
'';
postInstall = ''
pushd $out/include
ln -s wx-*/* .
popd
'';
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://www.wxwidgets.org/";
description = "A Cross-Platform C++ GUI Library";
longDescription = ''
wxWidgets gives you a single, easy-to-use API for writing GUI applications
on multiple platforms that still utilize the native platform's controls
and utilities. Link with the appropriate library for your platform and
compiler, and your application will adopt the look and feel appropriate to
that platform. On top of great GUI functionality, wxWidgets gives you:
online help, network programming, streams, clipboard and drag and drop,
multithreading, image loading and saving in a variety of popular formats,
database support, HTML viewing and printing, and much more.
'';
license = licenses.wxWindows;
maintainers = with maintainers; [ ];
platforms = platforms.darwin ++ platforms.linux;
badPlatforms = [ "x86_64-darwin" ];
};
passthru = {
inherit compat24 compat26 unicode;
gtk = gtk2;
};
}

View file

@ -0,0 +1,140 @@
{ lib
, stdenv
, fetchFromGitHub
, gst_all_1
, gtk2
, gtk3
, libGL
, libGLU
, libSM
, libXinerama
, libXxf86vm
, pkg-config
, xorgproto
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, compat26 ? false
, compat28 ? true
, unicode ? true
, withGtk2 ? true
, withWebKit ? false, webkitgtk
, AGL
, Carbon
, Cocoa
, Kernel
, QTKit
, setfile
}:
assert withGtk2 -> (!withWebKit);
let
gtk = if withGtk2 then gtk2 else gtk3;
in
stdenv.mkDerivation rec {
pname = "wxwidgets";
version = "3.0.5";
src = fetchFromGitHub {
owner = "wxWidgets";
repo = "wxWidgets";
rev = "v${version}";
hash = "sha256-p69nNCg552j+nldGY0oL65uFRVu4xXCkoE10F5MwY9A=";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gtk
libSM
libXinerama
libXxf86vm
xorgproto
]
++ lib.optional withMesa libGLU
++ lib.optional withWebKit webkitgtk
++ lib.optionals stdenv.isDarwin [
Carbon
Cocoa
Kernel
QTKit
setfile
];
propagatedBuildInputs = lib.optional stdenv.isDarwin AGL;
patches = [
# https://github.com/wxWidgets/wxWidgets/issues/17942
./patches/0001-fix-assertion-using-hide-in-destroy.patch
];
configureFlags = [
"--disable-precomp-headers"
"--enable-mediactrl"
(if compat26 then "--enable-compat26" else "--disable-compat26")
(if compat28 then "--enable-compat28" else "--disable-compat28")
]
++ lib.optional unicode "--enable-unicode"
++ lib.optional withMesa "--with-opengl"
++ lib.optionals stdenv.isDarwin [ # allow building on 64-bit
"--enable-universal-binaries"
"--with-cocoa"
"--with-macosx-version-min=10.7"
]
++ lib.optionals withWebKit [
"--enable-webview"
"--enable-webview-webkit"
];
SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib ";
preConfigure = ''
substituteInPlace configure --replace \
'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
substituteInPlace configure --replace \
'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
substituteInPlace configure --replace \
/usr /no-such-path
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace \
'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
substituteInPlace configure --replace \
"-framework System" "-lSystem"
'';
postInstall = ''
pushd $out/include
ln -s wx-*/* .
popd
'';
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://www.wxwidgets.org/";
description = "A Cross-Platform C++ GUI Library";
longDescription = ''
wxWidgets gives you a single, easy-to-use API for writing GUI applications
on multiple platforms that still utilize the native platform's controls
and utilities. Link with the appropriate library for your platform and
compiler, and your application will adopt the look and feel appropriate to
that platform. On top of great GUI functionality, wxWidgets gives you:
online help, network programming, streams, clipboard and drag and drop,
multithreading, image loading and saving in a variety of popular formats,
database support, HTML viewing and printing, and much more.
'';
license = licenses.wxWindows;
maintainers = with maintainers; [ ];
platforms = platforms.linux ++ platforms.darwin;
badPlatforms = [ "x86_64-darwin" ];
};
passthru = {
inherit gtk;
inherit compat26 compat28 unicode;
};
}

View file

@ -0,0 +1,156 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchurl
, gnome2
, gst_all_1
, gtk2
, gtk3
, libGL
, libGLU
, libSM
, libXinerama
, libXtst
, libXxf86vm
, pkg-config
, xorgproto
, compat28 ? false
, compat30 ? true
, unicode ? true
, withGtk2 ? (!stdenv.isDarwin)
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, withWebKit ? stdenv.isDarwin
, webkitgtk
, setfile
, AGL
, Carbon
, Cocoa
, Kernel
, QTKit
, AVFoundation
, AVKit
, WebKit
}:
assert withGtk2 -> (!withWebKit);
let
gtk = if withGtk2 then gtk2 else gtk3;
in
stdenv.mkDerivation rec {
pname = "wxwidgets";
version = "3.1.5";
src = fetchFromGitHub {
owner = "wxWidgets";
repo = "wxWidgets";
rev = "v${version}";
hash = "sha256-2zMvcva0GUDmSYK0Wk3/2Y6R3F7MgdqGBrOhmWgVA6g=";
fetchSubmodules = true;
};
patches = [
# https://github.com/wxWidgets/wxWidgets/issues/17942
./patches/0001-fix-assertion-using-hide-in-destroy.patch
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
gst_all_1.gst-plugins-base
gst_all_1.gstreamer
]
++ lib.optionals (!stdenv.isDarwin) [
gtk
libSM
libXinerama
libXtst
libXxf86vm
xorgproto
]
++ lib.optionals withGtk2 [
gnome2.GConf
]
++ lib.optional withMesa libGLU
++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk
++ lib.optional (withWebKit && stdenv.isDarwin) WebKit
++ lib.optionals stdenv.isDarwin [
setfile
Carbon
Cocoa
Kernel
QTKit
AVFoundation
AVKit
WebKit
];
propagatedBuildInputs = lib.optional stdenv.isDarwin AGL;
configureFlags = [
"--disable-precomp-headers"
# This is the default option, but be explicit
"--disable-monolithic"
"--enable-mediactrl"
(if compat28 then "--enable-compat28" else "--disable-compat28")
(if compat30 then "--enable-compat30" else "--disable-compat30")
]
++ lib.optional unicode "--enable-unicode"
++ lib.optional withMesa "--with-opengl"
++ lib.optionals stdenv.isDarwin [
"--with-osx_cocoa"
"--with-libiconv"
]
++ lib.optionals withWebKit [
"--enable-webview"
"--enable-webviewwebkit"
];
SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib ";
preConfigure = ''
substituteInPlace configure --replace \
'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
substituteInPlace configure --replace \
'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
substituteInPlace configure --replace \
/usr /no-such-path
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace \
'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
substituteInPlace configure --replace \
"-framework System" "-lSystem"
'';
postInstall = "
pushd $out/include
ln -s wx-*/* .
popd
";
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://www.wxwidgets.org/";
description = "A Cross-Platform C++ GUI Library";
longDescription = ''
wxWidgets gives you a single, easy-to-use API for writing GUI applications
on multiple platforms that still utilize the native platform's controls
and utilities. Link with the appropriate library for your platform and
compiler, and your application will adopt the look and feel appropriate to
that platform. On top of great GUI functionality, wxWidgets gives you:
online help, network programming, streams, clipboard and drag and drop,
multithreading, image loading and saving in a variety of popular formats,
database support, HTML viewing and printing, and much more.
'';
license = licenses.wxWindows;
maintainers = with maintainers; [ tfmoraes ];
platforms = platforms.unix;
};
passthru = {
inherit gtk;
inherit compat28 compat30 unicode;
};
}

View file

@ -0,0 +1,101 @@
{ lib
, stdenv
, fetchFromGitHub
, expat
, libiconv
, libjpeg
, libpng
, libtiff
, zlib
, AGL
, Cocoa
, Kernel
, WebKit
, derez
, rez
, setfile
}:
stdenv.mkDerivation rec {
pname = "wxmac";
version = "3.0.5.1";
src = fetchFromGitHub {
owner = "wxWidgets";
repo = "wxWidgets";
rev = "v${version}";
hash = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0=";
};
buildInputs = [
expat
libiconv
libjpeg
libpng
libtiff
zlib
AGL
Cocoa
Kernel
WebKit
derez
rez
setfile
];
postPatch = ''
substituteInPlace configure --replace "-framework System" "-lSystem"
'';
configureFlags = [
"--disable-mediactrl"
"--disable-precomp-headers"
"--enable-clipboard"
"--enable-controls"
"--enable-dataviewctrl"
"--enable-display"
"--enable-dnd"
"--enable-graphics_ctx"
"--enable-std_string"
"--enable-svg"
"--enable-unicode"
"--enable-webkit"
"--with-expat"
"--with-libjpeg"
"--with-libpng"
"--with-libtiff"
"--with-macosx-version-min=10.7"
"--with-opengl"
"--with-osx_cocoa"
"--with-zlib"
"--without-liblzma"
"wx_cv_std_libfullpath=/var/empty"
];
doCheck = true;
checkPhase = ''
./wx-config --libs
'';
NIX_CFLAGS_COMPILE = "-Wno-undef";
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://www.wxwidgets.org/";
description = "A Cross-Platform C++ GUI Library - MacOS-only build";
longDescription = ''
wxWidgets gives you a single, easy-to-use API for writing GUI applications
on multiple platforms that still utilize the native platform's controls
and utilities. Link with the appropriate library for your platform and
compiler, and your application will adopt the look and feel appropriate to
that platform. On top of great GUI functionality, wxWidgets gives you:
online help, network programming, streams, clipboard and drag and drop,
multithreading, image loading and saving in a variety of popular formats,
database support, HTML viewing and printing, and much more.
'';
license = licenses.wxWindows;
maintainers = with maintainers; [ lnl7 ];
platforms = platforms.darwin;
};
}