gtkd: 3.8.5 -> 3.9.0

+83 -51
+79 -47
pkgs/development/libraries/gtkd/default.nix
··· 1 - { stdenv, fetchzip, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg 2 - , glib, gtk3, gtksourceview, libgda, libpeas, pango, pkgconfig, which, vte }: 1 + { stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg 2 + , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkgconfig, which, vte }: 3 3 4 4 let 5 - inherit (gst_all_1) gstreamer gst-plugins-base; 5 + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; 6 6 in stdenv.mkDerivation rec { 7 7 pname = "gtkd"; 8 - version = "3.8.5"; 8 + version = "3.9.0"; 9 9 10 10 src = fetchzip { 11 11 url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip"; 12 - sha256 = "12n2njsaplra7x15nqwrj2hrf8a27pfjj2mck4mkzxv03qk6mqky"; 12 + sha256 = "12kc4s5gp6gn456d8pzhww1ggi9qbxldmcpp6855297g2x8xxy5p"; 13 13 stripRoot = false; 14 14 }; 15 15 16 16 nativeBuildInputs = [ dmd pkgconfig which ]; 17 17 propagatedBuildInputs = [ 18 - atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview 18 + atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4 19 19 libgda libpeas librsvg pango vte 20 20 ]; 21 21 22 + patches = [ 23 + # Fix makefile not installing .pc's 24 + (fetchpatch { 25 + url = "https://github.com/gtkd-developers/GtkD/commit/a9db09117ab27127ca4c3b8d2f308fae483a9199.patch"; 26 + sha256 = "0ngyqifw1kandc1vk01kms3z65pcisfd75q7z09rml96glhfzjd6"; 27 + }) 28 + ]; 29 + 22 30 prePatch = '' 23 31 substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d 24 - substituteInPlace src/cairo/c/functions-compiletime.d \ 25 - --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ 26 - --replace libcairo.dylib ${cairo}/lib/libcairo.dylib 27 - substituteInPlace src/cairo/c/functions-runtime.d \ 28 - --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ 29 - --replace libcairo.dylib ${cairo}/lib/libcairo.dylib 30 - substituteInPlace generated/gtkd/gdkpixbuf/c/functions.d \ 31 - --replace libgdk_pixbuf-2.0.so.0 ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \ 32 - --replace libgdk_pixbuf-2.0.0.dylib ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib 32 + 33 + substituteInPlace generated/gstreamer/gst/app/c/functions.d \ 34 + --replace libgstapp-1.0.so.0 ${gst-plugins-base}/lib/libgstapp-1.0.so.0 \ 35 + --replace libgstapp-1.0.0.dylib ${gst-plugins-base}/lib/libgstapp-1.0.0.dylib 36 + 37 + substituteInPlace generated/gstreamer/gst/base/c/functions.d \ 38 + --replace libgstbase-1.0.so.0 ${gstreamer.out}/lib/libgstbase-1.0.so.0 \ 39 + --replace libgstbase-1.0.0.dylib ${gstreamer.out}/lib/libgstbase-1.0.0.dylib 40 + 41 + substituteInPlace generated/gstreamer/gst/mpegts/c/functions.d \ 42 + --replace libgstmpegts-1.0.so.0 ${gst-plugins-bad.out}/lib/libgstmpegts-1.0.so.0 \ 43 + --replace libgstmpegts-1.0.0.dylib ${gst-plugins-bad.out}/lib/libgstmpegts-1.0.0.dylib 44 + 45 + substituteInPlace generated/gstreamer/gstinterfaces/c/functions.d \ 46 + --replace libgstvideo-1.0.so.0 ${gst-plugins-base}/lib/libgstvideo-1.0.so.0 \ 47 + --replace libgstvideo-1.0.0.dylib ${gst-plugins-base}/lib/libgstvideo-1.0.0.dylib 48 + 49 + substituteInPlace generated/gstreamer/gstreamer/c/functions.d \ 50 + --replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \ 51 + --replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib 52 + 33 53 substituteInPlace generated/gtkd/atk/c/functions.d \ 34 54 --replace libatk-1.0.so.0 ${atk}/lib/libatk-1.0.so.0 \ 35 55 --replace libatk-1.0.0.dylib ${atk}/lib/libatk-1.0.0.dylib 36 - substituteInPlace generated/gtkd/pango/c/functions.d \ 37 - --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 \ 38 - --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \ 39 - --replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \ 40 - --replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib 41 - substituteInPlace generated/gtkd/gobject/c/functions.d \ 42 - --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ 43 - --replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib 44 - substituteInPlace generated/gtkd/rsvg/c/functions.d \ 45 - --replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \ 46 - --replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib 56 + 47 57 substituteInPlace generated/gtkd/cairo/c/functions.d \ 48 58 --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ 49 59 --replace libcairo.dylib ${cairo}/lib/libcairo.dylib 60 + 50 61 substituteInPlace generated/gtkd/gdk/c/functions.d \ 51 62 --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \ 52 63 --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib 53 - substituteInPlace generated/peas/peas/c/functions.d \ 54 - --replace libpeas-1.0.so.0 ${libpeas}/lib/libpeas-1.0.so.0 \ 55 - --replace libpeas-gtk-1.0.so.0 ${libpeas}/lib/libpeas-gtk-1.0.so.0 \ 56 - --replace libpeas-1.0.0.dylib ${libpeas}/lib/libpeas-1.0.0.dylib \ 57 - --replace gtk-1.0.0.dylib ${libpeas}/lib/gtk-1.0.0.dylib 58 - substituteInPlace generated/vte/vte/c/functions.d \ 59 - --replace libvte-2.91.so.0 ${vte}/lib/libvte-2.91.so.0 \ 60 - --replace libvte-2.91.0.dylib ${vte}/lib/libvte-2.91.0.dylib 61 - substituteInPlace generated/gstreamer/gstinterfaces/c/functions.d \ 62 - --replace libgstvideo-1.0.so.0 ${gst-plugins-base}/lib/libgstvideo-1.0.so.0 \ 63 - --replace libgstvideo-1.0.0.dylib ${gst-plugins-base}/lib/libgstvideo-1.0.0.dylib 64 - substituteInPlace generated/sourceview/gsv/c/functions.d \ 65 - --replace libgtksourceview-3.0.so.1 ${gtksourceview}/lib/libgtksourceview-3.0.so.1 \ 66 - --replace libgtksourceview-3.0.1.dylib ${gtksourceview}/lib/libgtksourceview-3.0.1.dylib 64 + 65 + substituteInPlace generated/gtkd/gdkpixbuf/c/functions.d \ 66 + --replace libgdk_pixbuf-2.0.so.0 ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \ 67 + --replace libgdk_pixbuf-2.0.0.dylib ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib 68 + 69 + substituteInPlace generated/gtkd/gio/c/functions.d \ 70 + --replace libgio-2.0.so.0 ${glib.out}/lib/libgio-2.0.so.0 \ 71 + --replace libgio-2.0.0.dylib ${glib.out}/lib/libgio-2.0.0.dylib 72 + 67 73 substituteInPlace generated/gtkd/glib/c/functions.d \ 68 74 --replace libglib-2.0.so.0 ${glib.out}/lib/libglib-2.0.so.0 \ 69 75 --replace libgmodule-2.0.so.0 ${glib.out}/lib/libgmodule-2.0.so.0 \ ··· 71 77 --replace libglib-2.0.0.dylib ${glib.out}/lib/libglib-2.0.0.dylib \ 72 78 --replace libgmodule-2.0.0.dylib ${glib.out}/lib/libgmodule-2.0.0.dylib \ 73 79 --replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib 74 - substituteInPlace generated/gtkd/gio/c/functions.d \ 75 - --replace libgio-2.0.so.0 ${glib.out}/lib/libgio-2.0.so.0 \ 76 - --replace libgio-2.0.0.dylib ${glib.out}/lib/libgio-2.0.0.dylib 77 - substituteInPlace generated/gstreamer/gstreamer/c/functions.d \ 78 - --replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \ 79 - --replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib 80 + 81 + substituteInPlace generated/gtkd/gobject/c/functions.d \ 82 + --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ 83 + --replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib 84 + 80 85 substituteInPlace generated/gtkd/gtk/c/functions.d \ 81 86 --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \ 82 87 --replace libgtk-3.so.0 ${gtk3}/lib/libgtk-3.so.0 \ 83 88 --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib \ 84 89 --replace libgtk-3.0.dylib ${gtk3}/lib/libgtk-3.0.dylib 90 + 91 + substituteInPlace generated/gtkd/pango/c/functions.d \ 92 + --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 \ 93 + --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \ 94 + --replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \ 95 + --replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib 96 + 97 + substituteInPlace generated/gtkd/rsvg/c/functions.d \ 98 + --replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \ 99 + --replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib 100 + 101 + substituteInPlace generated/peas/peas/c/functions.d \ 102 + --replace libpeas-1.0.so.0 ${libpeas}/lib/libpeas-1.0.so.0 \ 103 + --replace libpeas-gtk-1.0.so.0 ${libpeas}/lib/libpeas-gtk-1.0.so.0 \ 104 + --replace libpeas-1.0.0.dylib ${libpeas}/lib/libpeas-1.0.0.dylib \ 105 + --replace gtk-1.0.0.dylib ${libpeas}/lib/gtk-1.0.0.dylib 106 + 107 + substituteInPlace generated/sourceview/gsv/c/functions.d \ 108 + --replace libgtksourceview-4.so.0 ${gtksourceview4}/lib/libgtksourceview-4.so.0 \ 109 + --replace libgtksourceview-4.0.dylib ${gtksourceview4}/lib/libgtksourceview-4.0.dylib 110 + 111 + substituteInPlace generated/vte/vte/c/functions.d \ 112 + --replace libvte-2.91.so.0 ${vte}/lib/libvte-2.91.so.0 \ 113 + --replace libvte-2.91.0.dylib ${vte}/lib/libvte-2.91.0.dylib 85 114 ''; 86 115 87 - installFlags = "prefix=$(out)"; 116 + makeFlags = [ 117 + "prefix=${placeholder "out"}" 118 + "PKG_CONFIG=${pkgconfig}/bin/pkg-config" 119 + ]; 88 120 89 121 meta = with stdenv.lib; { 90 122 description = "D binding and OO wrapper for GTK";
+4 -4
pkgs/development/libraries/gtkd/paths.d
··· 103 103 LIBRARY.GLGDK: "libgdkglext-3.0.dylib", 104 104 LIBRARY.GLGTK: "libgtkglext-3.0.dylib", 105 105 LIBRARY.GDA: "@libgda@/lib/libgda-2.dylib", 106 - LIBRARY.GSV: "@gtksourceview@/lib/libgtksourceview-3.0.dylib", 107 - LIBRARY.GSV1: "@gtksourceview@/lib/libgtksourceview-3.0.dylib", 106 + LIBRARY.GSV: "@gtksourceview4@/lib/libgtksourceview-4.0.dylib", 107 + LIBRARY.GSV1: "@gtksourceview4@/lib/libgtksourceview-4.0.dylib", 108 108 LIBRARY.GSTREAMER: "@gstreamer@/lib/libgstreamer-1.0.dylib", 109 109 LIBRARY.GSTINTERFACES: "@gst_plugins_base@/lib/libgstvideo-1.0.dylib", 110 110 LIBRARY.VTE: "@vte@/lib/libvte-2.91.dylib", ··· 131 131 LIBRARY.GLGDK: "libgdkglext-3.0.so.0", 132 132 LIBRARY.GLGTK: "libgtkglext-3.0.so.0", 133 133 LIBRARY.GDA: "@libgda@/lib/libgda-4.0.so.4", 134 - LIBRARY.GSV: "@gtksourceview@/lib/libgtksourceview-3.0.so.0", 135 - LIBRARY.GSV1: "@gtksourceview@/lib/libgtksourceview-3.0.so.1", 134 + LIBRARY.GSV: "@gtksourceview4@/lib/libgtksourceview-4.so.0", 135 + LIBRARY.GSV1: "@gtksourceview4@/lib/libgtksourceview-4.so.0", 136 136 LIBRARY.GSTREAMER: "@gstreamer@/lib/libgstreamer-1.0.so.0", 137 137 LIBRARY.GSTINTERFACES: "@gst_plugins_base@/lib/libgstvideo-1.0.so.0", 138 138 LIBRARY.VTE: "@vte@/lib/libvte-2.91.so.0",