Improve build and add dependencies

Signed-off-by: Andrew Opalach <andrew@akon.city>

4 files changed, 54 insertions, 2 deletions

diff --git a/env/wsl/bootstrap-configuration.nix b/env/wsl/bootstrap-configuration.nix
index 6439ba5..86464c8 100755
--- a/env/wsl/bootstrap-configuration.nix
+++ b/env/wsl/bootstrap-configuration.nix
@@ -3,7 +3,7 @@
   imports = [ <nixos-wsl/modules> ];
 
   wsl.enable = true;
-  wsl.defaultUser = "nixos";
+  wsl.defaultUser = "john";
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
diff --git a/env/wsl/flake.nix b/env/wsl/flake.nix
index ca45951..577b607 100755
--- a/env/wsl/flake.nix
+++ b/env/wsl/flake.nix
@@ -9,8 +9,19 @@
   };
 
   outputs = { self, nixpkgs, home-manager, nixos-wsl }: {
-    nixosConfigurations.wsl-dev = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.wsl-dev = let
       system = "x86_64-linux";
+      source-pkgs = nixpkgs.legacyPackages.${system};
+      nixpkgs-patched = source-pkgs.applyPatches {
+        name = "nixpkgs-patched";
+        src = nixpkgs;
+        patches = [
+          ./noto_cjk_no_variable.diff
+        ];
+      };
+      nixosSystem = import (nixpkgs-patched + "/nixos/lib/eval-config.nix");
+    in nixosSystem {
+      system = system;
       modules = [
         ({ pkgs, ... }: { nixpkgs.overlays = [ ]; })
         home-manager.nixosModules.home-manager {
diff --git a/env/wsl/noto_cjk_no_variable.diff b/env/wsl/noto_cjk_no_variable.diff
new file mode 100644
index 0000000..152c140
--- /dev/null
+++ b/env/wsl/noto_cjk_no_variable.diff
@@ -0,0 +1,40 @@
+diff --git a/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix b/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix
+index 5c7ab768..79981e27 100644
+--- a/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix
++++ b/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix
+@@ -13,12 +13,12 @@ stdenvNoCC.mkDerivation rec {
+     owner = "notofonts";
+     repo = "noto-cjk";
+     rev = "Sans${version}";
+-    hash = "sha256-IgalJkiOAVjNxKaPAQWfb5hKeqclliR4qVXCq63FGWY=";
+-    sparseCheckout = [ "Sans/Variable/OTC" ];
++    hash = "sha256-GXULnRPsIJRdiL3LdFtHbqTqSvegY2zodBxFm4P55to=";
++    sparseCheckout = [ "Sans/OTC" ];
+   };
+ 
+   installPhase = ''
+-    install -m444 -Dt $out/share/fonts/opentype/noto-cjk Sans/Variable/OTC/*.otf.ttc
++    install -m444 -Dt $out/share/fonts/opentype/noto-cjk Sans/OTC/*.ttc
+   '';
+ 
+   passthru.tests.noto-fonts = nixosTests.noto-fonts;
+diff --git a/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix b/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix
+index d9fddcc6..55cde591 100644
+--- a/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix
++++ b/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix
+@@ -13,12 +13,12 @@ stdenvNoCC.mkDerivation rec {
+     owner = "notofonts";
+     repo = "noto-cjk";
+     rev = "Serif${version}";
+-    hash = "sha256-GLjpTAiHfygj1J4AdUVDJh8kykkFOglq+h4kyat5W9s=";
+-    sparseCheckout = [ "Serif/Variable/OTC" ];
++    hash = "sha256-ihbhbv875XEHupFUzIdEweukqEmwQXCXCiTG7qisE64=";
++    sparseCheckout = [ "Serif/OTC" ];
+   };
+ 
+   installPhase = ''
+-    install -m444 -Dt $out/share/fonts/opentype/noto-cjk Serif/Variable/OTC/*.otf.ttc
++    install -m444 -Dt $out/share/fonts/opentype/noto-cjk Serif/OTC/*.ttc
+   '';
+ 
+   passthru.tests.noto-fonts = nixosTests.noto-fonts;
diff --git a/env/wsl/wsl-dev-host.nix b/env/wsl/wsl-dev-host.nix
index 6b6baea..ef7fbef 100755
--- a/env/wsl/wsl-dev-host.nix
+++ b/env/wsl/wsl-dev-host.nix
@@ -58,6 +58,7 @@ in {
       vistafonts
       noto-fonts
       noto-fonts-extra
+      noto-fonts-cjk
       noto-fonts-cjk-sans
       noto-fonts-cjk-serif
       noto-fonts-emoji-blob-bin