codeblocksFull: migrate to wxGTK32

+65 -2
+65 -2
pkgs/applications/editors/codeblocks/default.nix
··· 1 - { lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK31, gtk3 1 + { lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK32, gtk3 2 2 , contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook 3 3 }: 4 4 ··· 13 13 }; 14 14 15 15 nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ]; 16 - buildInputs = [ wxGTK31 gtk3 ] 16 + buildInputs = [ wxGTK32 gtk3 ] 17 17 ++ lib.optionals contribPlugins [ hunspell gamin boost ]; 18 18 enableParallelBuilding = true; 19 19 patches = [ ··· 48 48 sha256 = "sha256-RRjwZA37RllnG8cJdBEnASpEd8z0+ru96fjntO42OvU="; 49 49 }) 50 50 (fetchpatch { 51 + name = "fix-taskbar-icons.patch"; 52 + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/40eb88e3f2b933f19f9933e06c8d0899c54f5e25.patch"; 53 + hash = "sha256-Gj5gtxX5QNYAeF+QrPS/bBHLLEmflSxUHSLUK3GSs0I="; 54 + }) 55 + (fetchpatch { 56 + name = "fix-warnings.patch"; 57 + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/56ac0396fad7a5b4bbb40bb8c4b5fe1755078aef.patch"; 58 + excludes = [ "src/src/environmentsettingsdlg.h" ]; 59 + hash = "sha256-tl4rF9iAf1TzCIbKhVFqcxvr1IiPdwqLYZg0SY5BJ7I="; 60 + }) 61 + (fetchpatch { 51 62 name = "fix-getstring.patch"; 52 63 url = "https://github.com/arnholm/codeblocks_sfmirror/commit/dbdf5c5ea9e3161233f0588a7616b7e4fedc7870.patch"; 53 64 sha256 = "sha256-DrEMFluN8vs0LERa7ULGshl7HdejpsuvXAMjIr/K1fQ="; 65 + }) 66 + # Fix build with wxGTK 3.1.6 67 + (fetchpatch { 68 + name = "remove-code-for-old-wx-1.patch"; 69 + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/8035dfdff321754819f79e3165401aa59bd8c7f7.patch"; 70 + hash = "sha256-Z8Ap03W/XH5VwKFVudJr7rugb0BgI2dKJgQS4yIWbEM="; 71 + }) 72 + (fetchpatch { 73 + name = "remove-code-for-old-wx-2.patch"; 74 + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/9a9c6a9d5e3e0f6eff5594ecd61a2222f073be9c.patch"; 75 + hash = "sha256-SwYixvbRuXQ+jA1ijmClWkzqzzr0viVuFOAsihGc5dM="; 76 + }) 77 + (fetchpatch { 78 + name = "remove-code-for-old-wx-3.patch"; 79 + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/c28746f4887f10e6f9f10eeafae0fb22ecdbf9c7.patch"; 80 + hash = "sha256-1lcIiCnY2nBuUsffXC2rdglOE3ccIbogcgTx4M2Ee2I="; 81 + }) 82 + (fetchpatch { 83 + name = "fix-notebookstyles.patch"; 84 + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/29315df024251850832583f73e67e515dae10830.patch"; 85 + hash = "sha256-Uc1V0eEbNljnN+1Dqb/35MLSSoLjyuRZMTofgcXRyb8="; 86 + }) 87 + (fetchpatch { 88 + name = "fix-regex.patch"; 89 + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/46720043319758cb0e798eb23520063583c40eaa.patch"; 90 + hash = "sha256-Aix58T0JJcX/7VZukU/9i/nXh9GJywXC3yXEyUZK0js="; 91 + }) 92 + (fetchpatch { 93 + name = "fix-build-with-clang.patch"; 94 + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/92cb2239662952e3b59b31e03edd653bb8066e64.patch"; 95 + hash = "sha256-XI7JW9Nuueb7muKpaC2icM/CxhrCJtO48cLHK+BVWXI="; 96 + }) 97 + (fetchpatch { 98 + name = "fix-normalize.patch"; 99 + url = "https://github.com/archlinux/svntogit-community/raw/458eacb60bc0e71e3d333943cebbc41e75ed0956/trunk/sc_wxtypes-normalize.patch"; 100 + hash = "sha256-7wEwDLwuNUWHUwHjFyq74sHiuEha1VexRLEX42rPZSs="; 101 + }) 102 + # Fix HiDPI 103 + (fetchpatch { 104 + name = "update-about-dialog.patch"; 105 + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/a4aacc92640b587ad049cd6aa68c637e536e9ab5.patch"; 106 + hash = "sha256-2S4sVn+Dq5y9xcxCkzQ+WeR+qWxAOLbQUZEnk060RI0="; 107 + }) 108 + (fetchpatch { 109 + name = "add-display-info.patch"; 110 + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/f2f127cf5cd97c7da6a957a3f7764cb25cc9017e.patch"; 111 + hash = "sha256-C0dVfC0NIHMXfWNlOwjzoGz5tmG2dlnU/EE92Jjebbs="; 112 + }) 113 + (fetchpatch { 114 + name = "fix-hidpi.patch"; 115 + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/b2e4f1279804e1d11b71bc75eeb37072c3589296.patch"; 116 + hash = "sha256-/Xp6ww9C3V6I67tTA4MrGpSGo3J0MXzFjzQU7RxY84U="; 54 117 }) 55 118 ]; 56 119 preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";