Merge pull request #199539 from wegank/wxgtk28-drop

authored by Sandro and committed by GitHub c4756f61 a5592f86

+3 -251
-115
pkgs/development/libraries/wxwidgets/wxGTK28.nix
··· 1 - { lib 2 - , stdenv 3 - , fetchurl 4 - , cairo 5 - , gtk2 6 - , libGL 7 - , libGLU 8 - , libSM 9 - , libX11 10 - , libXinerama 11 - , libXxf86vm 12 - , pkg-config 13 - , xorgproto 14 - , compat24 ? false 15 - , compat26 ? true 16 - , unicode ? true 17 - , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms 18 - }: 19 - 20 - stdenv.mkDerivation rec { 21 - pname = "wxGTK"; 22 - version = "2.8.12.1"; 23 - 24 - src = fetchurl { 25 - url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; 26 - hash = "sha256-Hz8VPZ8VBMbOLSxLI+lAuPWLgfTLo1zaGluzEUIkPNA="; 27 - }; 28 - 29 - nativeBuildInputs = [ 30 - pkg-config 31 - ]; 32 - 33 - buildInputs = [ 34 - cairo 35 - gtk2 36 - libSM 37 - libX11 38 - libXinerama 39 - libXxf86vm 40 - xorgproto 41 - ] 42 - ++ lib.optional withMesa libGLU; 43 - 44 - configureFlags = [ 45 - "--enable-gtk2" 46 - "--disable-precomp-headers" 47 - "--enable-mediactrl" 48 - "--enable-graphics_ctx" 49 - (if compat24 then "--enable-compat24" else "--disable-compat24") 50 - (if compat26 then "--enable-compat26" else "--disable-compat26") 51 - ] 52 - ++ lib.optional unicode "--enable-unicode" 53 - ++ lib.optional withMesa "--with-opengl"; 54 - 55 - hardeningDisable = [ "format" ]; 56 - 57 - # These variables are used by configure to find some dependencies. 58 - SEARCH_INCLUDE = 59 - "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include"; 60 - SEARCH_LIB = 61 - "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib " 62 - + lib.optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib "; 63 - 64 - # Work around a bug in configure. 65 - NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1 -lX11 -lcairo -Wno-narrowing"; 66 - 67 - preConfigure = '' 68 - substituteInPlace configure --replace \ 69 - 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' 70 - substituteInPlace configure --replace \ 71 - 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' 72 - substituteInPlace configure --replace \ 73 - /usr /no-such-path 74 - ''; 75 - 76 - postBuild = '' 77 - pushd contrib/src 78 - make 79 - popd 80 - ''; 81 - 82 - postInstall = '' 83 - pushd contrib/src 84 - make install 85 - popd 86 - pushd $out/include 87 - ln -s wx-*/* . 88 - popd 89 - ''; 90 - 91 - enableParallelBuilding = true; 92 - 93 - meta = with lib; { 94 - homepage = "https://www.wxwidgets.org/"; 95 - description = "A Cross-Platform C++ GUI Library"; 96 - longDescription = '' 97 - wxWidgets gives you a single, easy-to-use API for writing GUI applications 98 - on multiple platforms that still utilize the native platform's controls 99 - and utilities. Link with the appropriate library for your platform and 100 - compiler, and your application will adopt the look and feel appropriate to 101 - that platform. On top of great GUI functionality, wxWidgets gives you: 102 - online help, network programming, streams, clipboard and drag and drop, 103 - multithreading, image loading and saving in a variety of popular formats, 104 - database support, HTML viewing and printing, and much more. 105 - ''; 106 - license = licenses.wxWindows; 107 - maintainers = with maintainers; [ ]; 108 - platforms = platforms.linux; 109 - }; 110 - 111 - passthru = { 112 - inherit compat24 compat26 unicode; 113 - gtk = gtk2; 114 - }; 115 - }
-127
pkgs/development/libraries/wxwidgets/wxGTK29.nix
··· 1 - { lib 2 - , stdenv 3 - , fetchFromGitHub 4 - , autoconf 5 - , gtk2 6 - , libGL 7 - , libGLU 8 - , libSM 9 - , libXinerama 10 - , libXxf86vm 11 - , pkg-config 12 - , xorgproto 13 - , compat24 ? false 14 - , compat26 ? true 15 - , unicode ? true 16 - , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms 17 - , AGL 18 - , Carbon 19 - , Cocoa 20 - , Kernel 21 - , QuickTime 22 - , setfile 23 - }: 24 - 25 - stdenv.mkDerivation rec { 26 - pname = "wxGTK"; 27 - version = "2.9.5"; 28 - 29 - src = fetchFromGitHub { 30 - owner = "wxWidgets"; 31 - repo = "wxWidgets"; 32 - rev = "v${version}"; 33 - hash = "sha256-izefAPU4lORZxQja7/InHyElJ1++2lDloR+xPudsRNE="; 34 - }; 35 - 36 - patches = [ 37 - # https://github.com/wxWidgets/wxWidgets/issues/17942 38 - ./patches/0001-fix-assertion-using-hide-in-destroy.patch 39 - ]; 40 - 41 - nativeBuildInputs = [ 42 - autoconf 43 - pkg-config 44 - ]; 45 - 46 - buildInputs = [ 47 - gtk2 48 - libSM 49 - libXinerama 50 - libXxf86vm 51 - xorgproto 52 - ] 53 - ++ lib.optional withMesa libGLU 54 - ++ lib.optionals stdenv.isDarwin [ 55 - Carbon 56 - Cocoa 57 - Kernel 58 - QuickTime 59 - setfile 60 - ]; 61 - 62 - propagatedBuildInputs = lib.optional stdenv.isDarwin AGL; 63 - 64 - configureFlags = [ 65 - "--disable-precomp-headers" 66 - "--enable-gtk2" 67 - (if compat24 then "--enable-compat24" else "--disable-compat24") 68 - (if compat26 then "--enable-compat26" else "--disable-compat26") 69 - ] 70 - ++ lib.optional unicode "--enable-unicode" 71 - ++ lib.optional withMesa "--with-opengl" 72 - ++ lib.optionals stdenv.isDarwin [ # allow building on 64-bit 73 - "--enable-universal-binaries" 74 - "--with-cocoa" 75 - "--with-macosx-version-min=10.7" 76 - ]; 77 - 78 - SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; 79 - 80 - preConfigure = '' 81 - ./autogen.sh 82 - substituteInPlace configure --replace \ 83 - 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' 84 - substituteInPlace configure --replace \ 85 - 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' 86 - substituteInPlace configure --replace \ 87 - /usr /no-such-path 88 - '' + lib.optionalString stdenv.isDarwin '' 89 - substituteInPlace configure --replace \ 90 - 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ 91 - 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' 92 - substituteInPlace configure --replace \ 93 - "-framework System" "-lSystem" 94 - ''; 95 - 96 - postInstall = '' 97 - pushd $out/include 98 - ln -s wx-*/* . 99 - popd 100 - ''; 101 - 102 - enableParallelBuilding = true; 103 - 104 - meta = with lib; { 105 - homepage = "https://www.wxwidgets.org/"; 106 - description = "A Cross-Platform C++ GUI Library"; 107 - longDescription = '' 108 - wxWidgets gives you a single, easy-to-use API for writing GUI applications 109 - on multiple platforms that still utilize the native platform's controls 110 - and utilities. Link with the appropriate library for your platform and 111 - compiler, and your application will adopt the look and feel appropriate to 112 - that platform. On top of great GUI functionality, wxWidgets gives you: 113 - online help, network programming, streams, clipboard and drag and drop, 114 - multithreading, image loading and saving in a variety of popular formats, 115 - database support, HTML viewing and printing, and much more. 116 - ''; 117 - license = licenses.wxWindows; 118 - maintainers = with maintainers; [ ]; 119 - platforms = platforms.darwin ++ platforms.linux; 120 - badPlatforms = [ "x86_64-darwin" ]; 121 - }; 122 - 123 - passthru = { 124 - inherit compat24 compat26 unicode; 125 - gtk = gtk2; 126 - }; 127 - }
+3
pkgs/top-level/aliases.nix
··· 1563 1563 wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name 1564 1564 wmii_hg = wmii; 1565 1565 ws = throw "ws has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 1566 + wxGTK = throw "wxGTK28 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04 1567 + wxGTK28 = throw "wxGTK28 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04 1568 + wxGTK29 = throw "wxGTK29 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04 1566 1569 wxGTK31-gtk2 = throw "'wxGTK31-gtk2' has been removed from nixpkgs as it depends on deprecated GTK2"; # Added 2022-10-27 1567 1570 wxGTK31-gtk3 = throw "'wxGTK31-gtk3' has been renamed to/replaced by 'wxGTK31'"; # Added 2022-10-27 1568 1571 wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31
-9
pkgs/top-level/all-packages.nix
··· 22913 22913 inherit (darwin.apple_sdk.frameworks) Cocoa; 22914 22914 }; 22915 22915 22916 - wxGTK = wxGTK28; 22917 - 22918 - wxGTK28 = callPackage ../development/libraries/wxwidgets/wxGTK28.nix { }; 22919 - 22920 - wxGTK29 = callPackage ../development/libraries/wxwidgets/wxGTK29.nix { 22921 - inherit (darwin.stubs) setfile; 22922 - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; 22923 - }; 22924 - 22925 22916 wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix { 22926 22917 withGtk2 = true; 22927 22918 inherit (darwin.stubs) setfile;