From aa18ed262ed46734ba689ecc1f70538da958e972 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 9 Jun 2025 01:00:00 +0800 Subject: [PATCH] gtkd: 3.10.0 -> 3.11.0 --- pkgs/by-name/gt/gtkd/package.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gt/gtkd/package.nix b/pkgs/by-name/gt/gtkd/package.nix index 2797c08dc915..da37f645e954 100644 --- a/pkgs/by-name/gt/gtkd/package.nix +++ b/pkgs/by-name/gt/gtkd/package.nix @@ -1,7 +1,8 @@ { lib, stdenv, - fetchzip, + fetchFromGitHub, + fetchpatch2, atk, cairo, dcompiler ? ldc, @@ -24,12 +25,13 @@ let in stdenv.mkDerivation rec { pname = "gtkd"; - version = "3.10.0"; + version = "3.11.0"; - src = fetchzip { - url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip"; - sha256 = "DEKVDexGyg/T3SdnnvRjaHq1LbDo8ekNslxKROpMCCE="; - stripRoot = false; + src = fetchFromGitHub { + owner = "gtkd-developers"; + repo = "GtkD"; + tag = "v${version}"; + hash = "sha256-UpPoskHtnI4nUOKdLorK89grgUUPrCvO4zrAl9LfjHA="; }; nativeBuildInputs = [ @@ -52,6 +54,13 @@ stdenv.mkDerivation rec { vte ]; + patches = [ + (fetchpatch2 { + url = "https://github.com/gtkd-developers/GtkD/commit/1e41b2da35c7dc2d18b118c632cb07137d048c2b.patch?full_index=1"; + hash = "sha256-8vQntjVrQH1+qHBBkB5PxcgLvucosEEPi43uqlnHe4g="; + }) + ]; + postPatch = '' substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d @@ -141,6 +150,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" "PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" + "GTKD_VERSION=${version}" ]; # The .pc files does not declare an `includedir=`, so the multiple