fcitx5-toki-pona: use fork w/ icons

pkgs/fcitx5-toki-pona/default.nix

@@ -0,0 +1,41 @@
+{ stdenv
+, fetchFromGitHub
+, kdePackages
+, python3
+, libime
+, lib
+}:
+
+stdenv.mkDerivation {
+  pname = "fcitx5-toki-pona";
+  version = "git";
+  src = fetchFromGitHub {
+    owner = "msyds";
+    repo = "fcitx5-toki-pona";
+    rev = "4b4314d642c647bc714c8876460b6779facda89c";
+    # rev = "icons";
+    hash = "sha256-5Keg+7AYkELYAlJkPszcjHgJ6TwBxnwNd3cpxSOEbGc=";
+  };
+  # src = /home/msyds/git/fcitx5-toki-pona;
+  buildInputs = [
+    kdePackages.fcitx5-chinese-addons
+  ];
+  nativeBuildInputs = [
+    python3
+    libime
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    python3 combine.py
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm644 -t $out/share/fcitx5/table table/*
+    install -Dm644 -t $out/share/fcitx5/inputmethod confs/*
+    find icons -name '*.png' -exec install -Dm644 {} "$out/share/{}" \;
+    runHook postInstall
+  '';
+}

pkgs/gf-core/default.nix

@@ -1,32 +1,30 @@
 { haskell
-, haskellPackages
 , stdenv
 , fetchFromGitHub
-, autoreconfHook
+, gf-pgf
+, applyPatches
+, compiler ? "ghc98"
 }:
 
 let
   version = "3.12";
-  src = fetchFromGitHub {
+  src = applyPatches rec {
-    owner = "GrammaticalFramework";
+    src = fetchFromGitHub {
-    repo = "gf-core";
+      owner = "GrammaticalFramework";
-    rev = "release-${version}";
+      repo = "gf-core";
-    hash = "sha256-9sB8tt2eOJT43kv2eaUYRQCzyBZOp6HvJdgGJQgiqks=";
+      rev = "release-${version}";
-  };
+      hash = "sha256-9sB8tt2eOJT43kv2eaUYRQCzyBZOp6HvJdgGJQgiqks=";
-  pkg = haskellPackages.callCabal2nixWithOptions "gf" src "--flag=-server" {};
+    };
-  gf-pgf = stdenv.mkDerivation {
+    patches = [
-    pname = "gf-pgf";
+      "${src}/nix/expose-all.patch"
-    version = "0.0.1";
+      "${src}/nix/revert-new-cabal-madness.patch"
-    src = "${src}/src/runtime/c";
+      ./fix-cabal-syntax-error.patch
-    nativeBuildInputs = [ autoreconfHook ];
+    ];
   };
+  hpkgs = haskell.packages.${compiler};
+  pkg = hpkgs.callCabal2nixWithOptions "gf" src "--flag=-server" {};
 in haskell.lib.overrideCabal pkg (prev: {
-  patches = [
-    "${src}/nix/expose-all.patch"
-    "${src}/nix/revert-new-cabal-madness.patch"
-  ];
   jailbreak = true;
   configureFlags = [ "-f" "c-runtime" ];
   librarySystemDepends = [ gf-pgf ];
-  passthru = { inherit gf-pgf; };
 })

pkgs/gf-core/fix-cabal-syntax-error.patch

@@ -0,0 +1,13 @@
+diff --git a/src/runtime/haskell-bind/pgf2.cabal b/src/runtime/haskell-bind/pgf2.cabal
+index d7a98489e..3ca7e816c 100644
+--- a/src/runtime/haskell-bind/pgf2.cabal
++++ b/src/runtime/haskell-bind/pgf2.cabal
+@@ -15,7 +15,7 @@ homepage: https://www.grammaticalframework.org/
+ bug-reports: https://github.com/GrammaticalFramework/gf-core/issues
+ author: Krasimir Angelov
+ extra-source-files: CHANGELOG.md, README.md
+-tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4, GHC=9.6.6
++tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4, GHC==9.6.6
+ 
+ library
+   exposed-modules:

pkgs/gf-pgf/default.nix

@@ -0,0 +1,11 @@
+{ gf-core
+, stdenv
+, autoreconfHook
+}:
+
+stdenv.mkDerivation {
+  pname = "gf-pgf";
+  inherit (gf-core) version meta;
+  src = "${gf-core.src}/src/runtime/c";
+  nativeBuildInputs = [autoreconfHook ];
+}

pkgs/gftest/default.nix

@@ -0,0 +1,26 @@
+{ gf-core
+, breakpointHook
+, fetchFromGitHub
+, compiler ? "ghc98"
+, haskell
+, pgf2-haskell
+, gf-pgf
+}:
+
+let
+  src = fetchFromGitHub {
+    owner = "GrammaticalFramework";
+    repo = "gftest";
+    rev = "ef7c99143d84a29fb28bbc464f661566d44a6130";
+    hash = "sha256-t/LaG5+bdv7f0URcn/aFx6nUIvxSSEbpWeZS92/Gbog=";
+  };
+  hpkgs = haskell.packages.${compiler}.extend (final: prev: {
+    # PGF2, the Haskell bindings to the C library.
+    pgf2 = pgf2-haskell.override { inherit compiler; };
+  });
+  pkg = hpkgs.callCabal2nix "gftest" src {};
+in pkg.overrideAttrs (final: prev: {
+  nativeBuildInputs = (prev.nativeBuildInputs or []) ++ [
+    breakpointHook
+  ];
+})

pkgs/pgf2-haskell/default.nix

@@ -0,0 +1,19 @@
+{ haskell
+, compiler ? "ghc96"
+, gf-pgf
+, gf-core
+, breakpointHook
+}:
+
+let
+  src = "${gf-core.src}/src/runtime/haskell-bind";
+  hpkgs = haskell.packages.${compiler};
+  pkg = hpkgs.callCabal2nix "pgf2" src {
+    # gf-pgf provides both libpgf and libgu.
+    gu = gf-pgf;
+  };
+in haskell.lib.overrideCabal pkg (prev: {
+  librarySystemDepends = (prev.librarySystemDepends or []) ++ [
+    gf-pgf
+  ];
+})