Unverified Commit 1b634094 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #222087 from wegank/wxperl-bump 

perl534Packages.Wx: migrate to wxGTK32
parents 2ab88f51 0bac6b83

pkgs/top-level/perl-packages.nix

+15 −2
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ let 
      substituteInPlace Build.PL \

        --replace "gtk+-2.0" "gtk+-3.0"

    '';

    propagatedBuildInputs = [ pkgs.pkg-config pkgs.gtk3 pkgs.wxGTK30 ModulePluggable ];

    propagatedBuildInputs = [ pkgs.pkg-config pkgs.gtk3 pkgs.wxGTK32 ModulePluggable ];

    buildInputs = [ LWPProtocolHttps ];

    meta = {

      description = "Building, finding and using wxWidgets binaries";
@@ -26993,10 +26993,23 @@ let 
    };

    patches = [

      (fetchpatch {

        url = "https://aur.archlinux.org/cgit/aur.git/plain/gtk3.patch?h=perl-wx&id=a3776d3747e3767d1e0f6d37bdaabf087f779fea";

        url = "https://sources.debian.org/data/main/libw/libwx-perl/1%3A0.9932-8/debian/patches/gtk3.patch";

        hash = "sha256-CokmRzDTFmEMN/jTKw9ECCPvi0mHt5+h8Ojg4Jgd7D4=";

      })

      (fetchpatch {

        url = "https://sources.debian.org/data/main/libw/libwx-perl/1%3A0.9932-8/debian/patches/wxWidgets_3.2_MakeMaker.patch";

        hash = "sha256-kTJiCGv8yxQbgMych9yT2cOt+2bL1G4oJ0gehNcu0Rc=";

      })

      (fetchpatch {

        url = "https://sources.debian.org/data/main/libw/libwx-perl/1%3A0.9932-8/debian/patches/wxWidgets_3.2_port.patch";

        hash = "sha256-y9LMpcbm7p8+LZ2Hw3PA2jc7bHAFEu0QRa170XuseKw=";

      })

    ];

    # DND.c:453:15: error: incompatible integer to pointer conversion assigning to 'NativeFormat' (aka 'const __CFString *') from 'wxDataFormatId'

    postPatch = ''

      substituteInPlace ext/dnd/XS/DataObject.xs \

        --replace "#ifdef __WXGTK20__" "#if wxUSE_GUI"

    '';

    propagatedBuildInputs = [ AlienWxWidgets ];

    # Testing requires an X server:

    #   Error: Unable to initialize GTK, is DISPLAY set properly?"