diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/gtkd | |
parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gtkd')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gtkd/default.nix | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gtkd/default.nix b/nixpkgs/pkgs/development/libraries/gtkd/default.nix index ed4326527005..d773434b8323 100644 --- a/nixpkgs/pkgs/development/libraries/gtkd/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtkd/default.nix @@ -1,40 +1,25 @@ -{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome, gst_all_1, librsvg +{ lib, stdenv, fetchzip, atk, cairo, dcompiler, gdk-pixbuf, gnome, gst_all_1, librsvg , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }: let inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; in stdenv.mkDerivation rec { pname = "gtkd"; - version = "3.9.0"; - - outputs = [ "out" "dev" ]; + version = "3.10.0"; src = fetchzip { url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip"; - sha256 = "12kc4s5gp6gn456d8pzhww1ggi9qbxldmcpp6855297g2x8xxy5p"; + sha256 = "DEKVDexGyg/T3SdnnvRjaHq1LbDo8ekNslxKROpMCCE="; stripRoot = false; }; - nativeBuildInputs = [ ldc pkg-config which ]; + nativeBuildInputs = [ dcompiler pkg-config which ]; propagatedBuildInputs = [ atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4 libgda libpeas librsvg pango vte ]; - patches = [ - # Fix makefile not installing .pc's - (fetchpatch { - url = "https://github.com/gtkd-developers/GtkD/commit/a9db09117ab27127ca4c3b8d2f308fae483a9199.patch"; - sha256 = "0ngyqifw1kandc1vk01kms3z65pcisfd75q7z09rml96glhfzjd6"; - }) - # Fix breakage with dmd ldc 1.26 and newer - (fetchpatch { - url = "https://github.com/gtkd-developers/GtkD/commit/323ff96c648882eaca2faee170bd9e90c6e1e9c3.patch"; - sha256 = "1rhyi0isl6fl5i6fgsinvgq6v72xq7c6sajrxcsnmrzpvw91il3d"; - }) - ]; - - prePatch = '' + postPatch = '' substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d substituteInPlace generated/gstreamer/gst/app/c/functions.d \ @@ -134,6 +119,10 @@ in stdenv.mkDerivation rec { done ''; + passthru = { + inherit dcompiler; + }; + meta = with lib; { description = "D binding and OO wrapper for GTK"; homepage = "https://gtkd.org"; |