commit 366e108e41299a48e3fcb64d66d6b6cb2bb889ef · pyrox.dev/nixpkgs

+1 -1

nixos/modules/programs/ccache.nix

···

       17
       17
        
             type = types.listOf types.str;

     

       18
       18
        
             description = lib.mdDoc "Nix top-level packages to be compiled using CCache";

     

       19
       19
        
             default = [];

     

       20
       20
       -
             example = [ "wxGTK30" "ffmpeg" "libav_all" ];

     

       20
       20
       +
             example = [ "wxGTK32" "ffmpeg" "libav_all" ];

     

       21
       21
        
           };

     

       22
       22
        
         };

     

       23
       23

+2 -2

pkgs/development/haskell-modules/configuration-nix.nix

···

       230
       230
        
       

     

       231
       231
        
         # wxc supports wxGTX >= 3.0, but our current default version points to 2.8.

     

       232
       232
        
         # http://hydra.cryp.to/build/1331287/log/raw

     

       233
       233
       -
         wxc = (addBuildDepend self.split super.wxc).override { wxGTK = pkgs.wxGTK30; };

     

       234
       234
       -
         wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; };

     

       233
       233
       +
         wxc = (addBuildDepend self.split super.wxc).override { wxGTK = pkgs.wxGTK32; };

     

       234
       234
       +
         wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK32; };

     

       235
       235
        
       

     

       236
       236
        
         # Test suite wants to connect to $DISPLAY.

     

       237
       237
        
         bindings-GLFW = dontCheck super.bindings-GLFW;

-146

pkgs/development/libraries/wxwidgets/wxGTK30.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , stdenv

     

       3
       3
       -
       , expat

     

       4
       4
       -
       , fetchFromGitHub

     

       5
       5
       -
       , gst_all_1

     

       6
       6
       -
       , gtk3

     

       7
       7
       -
       , libGL

     

       8
       8
       -
       , libGLU

     

       9
       9
       -
       , libSM

     

       10
       10
       -
       , libXinerama

     

       11
       11
       -
       , libXxf86vm

     

       12
       12
       -
       , libpng

     

       13
       13
       -
       , libtiff

     

       14
       14
       -
       , libjpeg_turbo

     

       15
       15
       -
       , zlib

     

       16
       16
       -
       , pkg-config

     

       17
       17
       -
       , xorgproto

     

       18
       18
       -
       , compat26 ? false

     

       19
       19
       -
       , compat28 ? true

     

       20
       20
       -
       , unicode ? true

     

       21
       21
       -
       , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms

     

       22
       22
       -
       , withWebKit ? false

     

       23
       23
       -
       , webkitgtk

     

       24
       24
       -
       , setfile

     

       25
       25
       -
       , AGL

     

       26
       26
       -
       , Carbon

     

       27
       27
       -
       , Cocoa

     

       28
       28
       -
       , Kernel

     

       29
       29
       -
       , QTKit

     

       30
       30
       -
       , AVFoundation

     

       31
       31
       -
       , AVKit

     

       32
       32
       -
       , WebKit

     

       33
       33
       -
       }:

     

       34
       34
       -
       

     

       35
       35
       -
       stdenv.mkDerivation rec {

     

       36
       36
       -
         pname = "wxwidgets";

     

       37
       37
       -
         version = "3.0.5.1";

     

       38
       38
       -
       

     

       39
       39
       -
         src = fetchFromGitHub {

     

       40
       40
       -
           owner = "wxWidgets";

     

       41
       41
       -
           repo = "wxWidgets";

     

       42
       42
       -
           rev = "v${version}";

     

       43
       43
       -
           hash = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0=";

     

       44
       44
       -
         };

     

       45
       45
       -
       

     

       46
       46
       -
         nativeBuildInputs = [ pkg-config ];

     

       47
       47
       -
       

     

       48
       48
       -
         buildInputs = [

     

       49
       49
       -
           gst_all_1.gst-plugins-base

     

       50
       50
       -
           gst_all_1.gstreamer

     

       51
       51
       -
           libpng

     

       52
       52
       -
           libtiff

     

       53
       53
       -
           libjpeg_turbo

     

       54
       54
       -
           zlib

     

       55
       55
       -
         ] ++ lib.optionals stdenv.isLinux [

     

       56
       56
       -
           gtk3

     

       57
       57
       -
           libSM

     

       58
       58
       -
           libXinerama

     

       59
       59
       -
           libXxf86vm

     

       60
       60
       -
           xorgproto

     

       61
       61
       -
         ]

     

       62
       62
       -
         ++ lib.optional withMesa libGLU

     

       63
       63
       -
         ++ lib.optional (withWebKit && stdenv.isLinux) webkitgtk

     

       64
       64
       -
         ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit

     

       65
       65
       -
         ++ lib.optionals stdenv.isDarwin [

     

       66
       66
       -
           expat

     

       67
       67
       -
           setfile

     

       68
       68
       -
           Carbon

     

       69
       69
       -
           Cocoa

     

       70
       70
       -
           Kernel

     

       71
       71
       -
           QTKit

     

       72
       72
       -
           AVFoundation

     

       73
       73
       -
           AVKit

     

       74
       74
       -
         ];

     

       75
       75
       -
       

     

       76
       76
       -
         propagatedBuildInputs = lib.optional stdenv.isDarwin AGL;

     

       77
       77
       -
       

     

       78
       78
       -
         patches = [

     

       79
       79
       -
           # https://github.com/wxWidgets/wxWidgets/issues/17942

     

       80
       80
       -
           ./patches/0001-fix-assertion-using-hide-in-destroy.patch

     

       81
       81
       -
         ];

     

       82
       82
       -
       

     

       83
       83
       -
         configureFlags = [

     

       84
       84
       -
           "--disable-precomp-headers"

     

       85
       85
       -
           "--enable-mediactrl"

     

       86
       86
       -
           (if compat26 then "--enable-compat26" else "--disable-compat26")

     

       87
       87
       -
           (if compat28 then "--enable-compat28" else "--disable-compat28")

     

       88
       88
       -
         ] ++ lib.optional unicode "--enable-unicode"

     

       89
       89
       -
         ++ lib.optional withMesa "--with-opengl"

     

       90
       90
       -
         ++ lib.optionals stdenv.isDarwin [

     

       91
       91
       -
           # allow building on 64-bit

     

       92
       92
       -
           "--enable-universal-binaries"

     

       93
       93
       -
           "--with-macosx-version-min=10.7"

     

       94
       94
       -
           "--with-osx_cocoa"

     

       95
       95
       -
           "--with-libiconv"

     

       96
       96
       -
         ] ++ lib.optionals withWebKit [

     

       97
       97
       -
           "--enable-webview"

     

       98
       98
       -
           "--enable-webviewwebkit"

     

       99
       99
       -
         ];

     

       100
       100
       -
       

     

       101
       101
       -
         SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib";

     

       102
       102
       -
       

     

       103
       103
       -
         preConfigure = ''

     

       104
       104
       -
           substituteInPlace configure --replace \

     

       105
       105
       -
             'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='

     

       106
       106
       -
           substituteInPlace configure --replace \

     

       107
       107
       -
             'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='

     

       108
       108
       -
           substituteInPlace configure --replace \

     

       109
       109
       -
             /usr /no-such-path

     

       110
       110
       -
         '' + lib.optionalString stdenv.isDarwin ''

     

       111
       111
       -
           substituteInPlace configure \

     

       112
       112
       -
             --replace 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'

     

       113
       113
       -
           substituteInPlace configure \

     

       114
       114
       -
             --replace "-framework System" "-lSystem"

     

       115
       115
       -
         '';

     

       116
       116
       -
       

     

       117
       117
       -
         postInstall = ''

     

       118
       118
       -
           pushd $out/include

     

       119
       119
       -
           ln -s wx-*/* .

     

       120
       120
       -
           popd

     

       121
       121
       -
         '';

     

       122
       122
       -
       

     

       123
       123
       -
         enableParallelBuilding = true;

     

       124
       124
       -
       

     

       125
       125
       -
         meta = with lib; {

     

       126
       126
       -
           homepage = "https://www.wxwidgets.org/";

     

       127
       127
       -
           description = "A Cross-Platform C++ GUI Library";

     

       128
       128
       -
           longDescription = ''

     

       129
       129
       -
             wxWidgets gives you a single, easy-to-use API for writing GUI applications

     

       130
       130
       -
             on multiple platforms that still utilize the native platform's controls

     

       131
       131
       -
             and utilities. Link with the appropriate library for your platform and

     

       132
       132
       -
             compiler, and your application will adopt the look and feel appropriate to

     

       133
       133
       -
             that platform. On top of great GUI functionality, wxWidgets gives you:

     

       134
       134
       -
             online help, network programming, streams, clipboard and drag and drop,

     

       135
       135
       -
             multithreading, image loading and saving in a variety of popular formats,

     

       136
       136
       -
             database support, HTML viewing and printing, and much more.

     

       137
       137
       -
           '';

     

       138
       138
       -
           license = licenses.wxWindows;

     

       139
       139
       -
           maintainers = with maintainers; [ wegank ];

     

       140
       140
       -
           platforms = platforms.unix;

     

       141
       141
       -
         };

     

       142
       142
       -
       

     

       143
       143
       -
         passthru = {

     

       144
       144
       -
           inherit compat26 compat28 unicode;

     

       145
       145
       -
         };

     

       146
       146
       -
       }

-101

pkgs/development/libraries/wxwidgets/wxmac30.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , stdenv

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , expat

     

       5
       5
       -
       , libiconv

     

       6
       6
       -
       , libjpeg

     

       7
       7
       -
       , libpng

     

       8
       8
       -
       , libtiff

     

       9
       9
       -
       , zlib

     

       10
       10
       -
       , AGL

     

       11
       11
       -
       , Cocoa

     

       12
       12
       -
       , Kernel

     

       13
       13
       -
       , WebKit

     

       14
       14
       -
       , derez

     

       15
       15
       -
       , rez

     

       16
       16
       -
       , setfile

     

       17
       17
       -
       }:

     

       18
       18
       -
       

     

       19
       19
       -
       stdenv.mkDerivation rec {

     

       20
       20
       -
         pname = "wxmac";

     

       21
       21
       -
         version = "3.0.5.1";

     

       22
       22
       -
       

     

       23
       23
       -
         src = fetchFromGitHub {

     

       24
       24
       -
           owner = "wxWidgets";

     

       25
       25
       -
           repo = "wxWidgets";

     

       26
       26
       -
           rev = "v${version}";

     

       27
       27
       -
           hash = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0=";

     

       28
       28
       -
         };

     

       29
       29
       -
       

     

       30
       30
       -
         buildInputs = [

     

       31
       31
       -
           expat

     

       32
       32
       -
           libiconv

     

       33
       33
       -
           libjpeg

     

       34
       34
       -
           libpng

     

       35
       35
       -
           libtiff

     

       36
       36
       -
           zlib

     

       37
       37
       -
           AGL

     

       38
       38
       -
           Cocoa

     

       39
       39
       -
           Kernel

     

       40
       40
       -
           WebKit

     

       41
       41
       -
           derez

     

       42
       42
       -
           rez

     

       43
       43
       -
           setfile

     

       44
       44
       -
         ];

     

       45
       45
       -
       

     

       46
       46
       -
         postPatch = ''

     

       47
       47
       -
           substituteInPlace configure --replace "-framework System" "-lSystem"

     

       48
       48
       -
         '';

     

       49
       49
       -
       

     

       50
       50
       -
         configureFlags = [

     

       51
       51
       -
           "--disable-mediactrl"

     

       52
       52
       -
           "--disable-precomp-headers"

     

       53
       53
       -
           "--enable-clipboard"

     

       54
       54
       -
           "--enable-controls"

     

       55
       55
       -
           "--enable-dataviewctrl"

     

       56
       56
       -
           "--enable-display"

     

       57
       57
       -
           "--enable-dnd"

     

       58
       58
       -
           "--enable-graphics_ctx"

     

       59
       59
       -
           "--enable-std_string"

     

       60
       60
       -
           "--enable-svg"

     

       61
       61
       -
           "--enable-unicode"

     

       62
       62
       -
           "--enable-webkit"

     

       63
       63
       -
           "--with-expat"

     

       64
       64
       -
           "--with-libjpeg"

     

       65
       65
       -
           "--with-libpng"

     

       66
       66
       -
           "--with-libtiff"

     

       67
       67
       -
           "--with-macosx-version-min=10.7"

     

       68
       68
       -
           "--with-opengl"

     

       69
       69
       -
           "--with-osx_cocoa"

     

       70
       70
       -
           "--with-zlib"

     

       71
       71
       -
           "--without-liblzma"

     

       72
       72
       -
           "wx_cv_std_libfullpath=/var/empty"

     

       73
       73
       -
         ];

     

       74
       74
       -
       

     

       75
       75
       -
         doCheck = true;

     

       76
       76
       -
         checkPhase = ''

     

       77
       77
       -
           ./wx-config --libs

     

       78
       78
       -
         '';

     

       79
       79
       -
       

     

       80
       80
       -
         env.NIX_CFLAGS_COMPILE = "-Wno-undef";

     

       81
       81
       -
       

     

       82
       82
       -
         enableParallelBuilding = true;

     

       83
       83
       -
       

     

       84
       84
       -
         meta = with lib; {

     

       85
       85
       -
           homepage = "https://www.wxwidgets.org/";

     

       86
       86
       -
           description = "A Cross-Platform C++ GUI Library - MacOS-only build";

     

       87
       87
       -
           longDescription = ''

     

       88
       88
       -
             wxWidgets gives you a single, easy-to-use API for writing GUI applications

     

       89
       89
       -
             on multiple platforms that still utilize the native platform's controls

     

       90
       90
       -
             and utilities. Link with the appropriate library for your platform and

     

       91
       91
       -
             compiler, and your application will adopt the look and feel appropriate to

     

       92
       92
       -
             that platform. On top of great GUI functionality, wxWidgets gives you:

     

       93
       93
       -
             online help, network programming, streams, clipboard and drag and drop,

     

       94
       94
       -
             multithreading, image loading and saving in a variety of popular formats,

     

       95
       95
       -
             database support, HTML viewing and printing, and much more.

     

       96
       96
       -
           '';

     

       97
       97
       -
           license = licenses.wxWindows;

     

       98
       98
       -
           maintainers = with maintainers; [ lnl7 ];

     

       99
       99
       -
           platforms = platforms.darwin;

     

       100
       100
       -
         };

     

       101
       101
       -
       }

+4 -2

pkgs/top-level/aliases.nix

···

       1675
       1675
        
         wxGTK = throw "wxGTK28 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04

     

       1676
       1676
        
         wxGTK28 = throw "wxGTK28 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04

     

       1677
       1677
        
         wxGTK29 = throw "wxGTK29 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04

     

       1678
       1678
       -
         wxGTK30-gtk2 = throw "'wxGTK30-gtk2' has been removed from nixpkgs as it depends on deprecated GTK2"; # Added 2022-12-03

     

       1679
       1679
       -
         wxGTK30-gtk3 = throw "'wxGTK30-gtk3' has been renamed to/replaced by 'wxGTK30'"; # Added 2022-12-03

     

       1678
       1678
       +
         wxGTK30 = throw "wxGTK30 has been removed from nixpkgs as it has reached end of life"; # Added 2023-03-22

     

       1679
       1679
       +
         wxGTK30-gtk2 = wxGTK30; # Added 2022-12-03

     

       1680
       1680
       +
         wxGTK30-gtk3 = wxGTK30; # Added 2022-12-03

     

       1680
       1681
        
         wxGTK31-gtk2 = throw "'wxGTK31-gtk2' has been removed from nixpkgs as it depends on deprecated GTK2"; # Added 2022-10-27

     

       1681
       1682
        
         wxGTK31-gtk3 = throw "'wxGTK31-gtk3' has been renamed to/replaced by 'wxGTK31'"; # Added 2022-10-27

     

       1683
       1683
       +
         wxmac = wxGTK30; # Added 2023-03-22

     

       1682
       1684
        
         wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31

     

       1683
       1685
        
         wxcam = throw "'wxcam' has seen no updates in ten years, crashes (SIGABRT) on startup and depends on deprecated wxGTK28/GNOME2/GTK2, use 'gnome.cheese'"; # Added 2022-06-15

     

       1684
       1686

-10

pkgs/top-level/all-packages.nix

···

       24085
       24085
        
           inherit (darwin.apple_sdk.frameworks) Cocoa;

     

       24086
       24086
        
         };

     

       24087
       24087
        
       

     

       24088
       24088
       -
         wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix {

     

       24089
       24089
       -
           inherit (darwin.stubs) setfile;

     

       24090
       24090
       -
           inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;

     

       24091
       24091
       -
         };

     

       24092
       24092
       -
       

     

       24093
       24093
       -
         wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix {

     

       24094
       24094
       -
           inherit (darwin.stubs) derez rez setfile;

     

       24095
       24095
       -
           inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit;

     

       24096
       24096
       -
         };

     

       24097
       24097
       -
       

     

       24098
       24088
        
         wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix {

     

       24099
       24089
        
           inherit (darwin.stubs) setfile;

     

       24100
       24090
        
           inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;