Merge pull request #199539 from wegank/wxgtk28-drop (c4756f61) · Commits · nix / nixpkgs

pkgs/development/libraries/wxwidgets/wxGTK28.nix

deleted100644 → 0

+0 −115

Original line number	Diff line number	Diff line
		{ 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;
		};
		}

pkgs/development/libraries/wxwidgets/wxGTK29.nix

deleted100644 → 0

+0 −127

Original line number	Diff line number	Diff line
		{ 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;
		};
		}

pkgs/top-level/aliases.nix

+3 −0

Original line number	Diff line number	Diff line
		@@ -1563,6 +1563,9 @@ mapAliases ({
		wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
		wmii_hg = wmii;
		ws = throw "ws has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
		wxGTK = throw "wxGTK28 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04
		wxGTK28 = throw "wxGTK28 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04
		wxGTK29 = throw "wxGTK29 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04
		wxGTK31-gtk2 = throw "'wxGTK31-gtk2' has been removed from nixpkgs as it depends on deprecated GTK2"; # Added 2022-10-27
		wxGTK31-gtk3 = throw "'wxGTK31-gtk3' has been renamed to/replaced by 'wxGTK31'"; # Added 2022-10-27
		wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31

pkgs/top-level/all-packages.nix

+0 −9

Original line number	Diff line number	Diff line
		@@ -22913,15 +22913,6 @@ with pkgs;
		inherit (darwin.apple_sdk.frameworks) Cocoa;
		};

		wxGTK = wxGTK28;

		wxGTK28 = callPackage ../development/libraries/wxwidgets/wxGTK28.nix { };

		wxGTK29 = callPackage ../development/libraries/wxwidgets/wxGTK29.nix {
		inherit (darwin.stubs) setfile;
		inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
		};

		wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix {
		withGtk2 = true;
		inherit (darwin.stubs) setfile;

Admin message