diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-10-25 00:15:54 +0100 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2018-10-25 00:15:54 +0100 |
commit | fcbaa7527d017b629c362cb4c9b1d65f86cb4bdc (patch) | |
tree | 8cd3e2689cc1fbeba589b745d28809732c8d1832 /pkgs/development/libraries/wxwidgets | |
parent | 0df3d8d6c40f3c323fece42b283f45227f5ea88e (diff) | |
download | nixpkgs-fcbaa7527d017b629c362cb4c9b1d65f86cb4bdc.tar nixpkgs-fcbaa7527d017b629c362cb4c9b1d65f86cb4bdc.tar.gz nixpkgs-fcbaa7527d017b629c362cb4c9b1d65f86cb4bdc.tar.bz2 nixpkgs-fcbaa7527d017b629c362cb4c9b1d65f86cb4bdc.tar.lz nixpkgs-fcbaa7527d017b629c362cb4c9b1d65f86cb4bdc.tar.xz nixpkgs-fcbaa7527d017b629c362cb4c9b1d65f86cb4bdc.tar.zst nixpkgs-fcbaa7527d017b629c362cb4c9b1d65f86cb4bdc.zip |
wxmac: 3.0.2 -> 3.0.4
Diffstat (limited to 'pkgs/development/libraries/wxwidgets')
-rw-r--r-- | pkgs/development/libraries/wxwidgets/3.0/mac.nix | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index a13ade3bb74..040273e28b9 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -1,54 +1,18 @@ -{ stdenv, fetchurl, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib +{ stdenv, fetchzip, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib # darwin only attributes , cf-private, derez, rez, setfile , AGL, Cocoa, Kernel }: stdenv.mkDerivation rec { - version = "3.0.2"; + version = "3.0.4"; name = "wxmac-${version}"; - src = fetchurl { - url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; - sha256 = "346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d"; + src = fetchzip { + url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz"; + sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1"; }; - patches = - [ # Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems - # with abiguous overloads for clang-3.8 and gcc6. - (fetchpatch { - name = "patch-stc-abs.diff"; - url = https://github.com/wxWidgets/wxWidgets/commit/73e9e18ea09ffffcaac50237def0d9728a213c02.patch; - sha256 = "0w5whmfzm8waw62jmippming0zffa9064m5b3aw5nixph21rlcvq"; - }) - - # Various fixes related to Yosemite. Revisit in next stable release. - # Please keep an eye on http://trac.wxwidgets.org/ticket/16329 as well - # Theoretically the above linked patch should still be needed, but it isn't. - # Try to find out why. - (fetchpatch { - name = "patch-yosemite.diff"; - url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-yosemite.diff; - sha256 = "0ss66z2a79v976mvlrskyj1zmkyaz8hbwm98p29bscfvcx5845jb"; - }) - - # Remove uncenessary <QuickTime/QuickTime.h> includes - # http://trac.wxwidgets.org/changeset/f6a2d1caef5c6d412c84aa900cb0d3990b350938/git-wxWidgets - (fetchpatch { - name = "patch-quicktime-removal.diff"; - url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-quicktime-removal.diff; - sha256 = "0mzvdk8r70p9s1wj7qzdsqmdrlxlf2dalh9gqs8xjkqq2666yp0y"; - }) - - # Patch for wxOSXPrintData, custom paper not applied - # http://trac.wxwidgets.org/ticket/16959 - (fetchpatch { - name = "wxPaperCustomPatch.patch"; - url = http://trac.wxwidgets.org/raw-attachment/ticket/16959/wxPaperCustomPatch.patch; - sha256 = "0xgscv86f8dhggn9n8bhlq9wlj3ydsicgy9v35sraxyma18cbjvl"; - }) - ]; - buildInputs = [ expat libiconv libjpeg libpng libtiff zlib derez rez setfile |