diff options
| -rw-r--r-- | .gitignore | 14 | ||||
| -rwxr-xr-x | env/clang_cl_env.bat | 3 | ||||
| -rwxr-xr-x | env/msvc_env.bat | 3 | ||||
| -rwxr-xr-x | env/msys2_env.sh | 5 | ||||
| -rwxr-xr-x | env/set_al_env.sh | 4 | ||||
| -rwxr-xr-x | env/wsl/bootstrap-configuration.nix | 3 | ||||
| -rwxr-xr-x | env/wsl/flake.lock | 136 | ||||
| -rwxr-xr-x | env/wsl/flake.nix | 36 | ||||
| -rw-r--r-- | env/wsl/kitty_new_window.bat | 2 | ||||
| -rw-r--r-- | env/wsl/settings.nix | 3 | ||||
| -rwxr-xr-x | env/wsl/wsl-dev-host.nix | 80 | ||||
| -rw-r--r-- | flake.lock | 117 | ||||
| -rw-r--r-- | flake.nix | 55 | ||||
| -rw-r--r-- | hardware/cmsb-001/configuration.nix | 5 | ||||
| -rwxr-xr-x | scripts/run_server.sh | 1 | ||||
| -rw-r--r-- | subprojects/fontconfig.wrap | 3 | ||||
| -rw-r--r-- | subprojects/freetype2.wrap | 3 | ||||
| -rw-r--r-- | subprojects/fribidi.wrap | 3 | ||||
| -rw-r--r-- | subprojects/harfbuzz.wrap | 3 | ||||
| -rw-r--r-- | subprojects/libass.wrap | 1 |
20 files changed, 200 insertions, 280 deletions
@@ -12,24 +12,26 @@ src/portal/vendor/* subprojects/BLAKE3/ subprojects/c89atomic.wrap subprojects/c89atomic/ +subprojects/expat-*/ +subprojects/expat.wrap subprojects/ffmpeg-*/ -subprojects/fontconfig/ -subprojects/freetype2/ -subprojects/fribidi/ +subprojects/fontconfig-*/ +subprojects/freetype-*/ +subprojects/fribidi-*/ +subprojects/glfm-*/ subprojects/glfm.wrap -subprojects/glfm/ subprojects/glfw3.wrap subprojects/glfw3/ subprojects/gperf.wrap subprojects/gperf/ -subprojects/harfbuzz/ +subprojects/harfbuzz-*/ subprojects/jansson.wrap subprojects/jansson/ subprojects/libakiyo subprojects/libakiyo/ subprojects/libalabaster subprojects/libalabaster/ -subprojects/libass/ +subprojects/libass-*/ subprojects/libcdio-paranoia/ subprojects/libcurl.wrap subprojects/libcurl/ diff --git a/env/clang_cl_env.bat b/env/clang_cl_env.bat deleted file mode 100755 index 0950a4e..0000000 --- a/env/clang_cl_env.bat +++ /dev/null @@ -1,3 +0,0 @@ -set PATH=%PATH%;C:\msys64\usr\bin;Z:\camu\bin
-set CC=clang-cl
-set CXX=clang-cl
diff --git a/env/msvc_env.bat b/env/msvc_env.bat deleted file mode 100755 index ea41011..0000000 --- a/env/msvc_env.bat +++ /dev/null @@ -1,3 +0,0 @@ -set PATH=%PATH%;C:\msys64\usr\bin;Z:\camu\bin
-set CC=cl
-set CXX=cl
diff --git a/env/msys2_env.sh b/env/msys2_env.sh deleted file mode 100755 index ea88557..0000000 --- a/env/msys2_env.sh +++ /dev/null @@ -1,5 +0,0 @@ -export PATH="/c/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.37.32822/bin/Hostx64/x64/":"/c/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build":"/z/camu/bin":$PATH
-#export CC=cl
-#export CXX=cl
-export CC=clang
-export CXX=clang++
diff --git a/env/set_al_env.sh b/env/set_al_env.sh deleted file mode 100755 index 2a17d11..0000000 --- a/env/set_al_env.sh +++ /dev/null @@ -1,4 +0,0 @@ -echo "Setting env using build-dir $1..." -export LD_LIBRARY_PATH=$HOME/c/camu/$1/subprojects/libakiyo/subprojects/libalabaster -export LIBRARY_PATH=$HOME/c/camu/$1/subprojects/libakiyo/subprojects/libalabaster -export C_INCLUDE_PATH=$HOME/c/camu/subprojects/libakiyo/subprojects/libalabaster/include diff --git a/env/wsl/bootstrap-configuration.nix b/env/wsl/bootstrap-configuration.nix index 86464c8..03f4bbf 100755 --- a/env/wsl/bootstrap-configuration.nix +++ b/env/wsl/bootstrap-configuration.nix @@ -1,5 +1,4 @@ -{ config, lib, pkgs, ... }: -{ +{ pkgs, ... }: { imports = [ <nixos-wsl/modules> ]; wsl.enable = true; diff --git a/env/wsl/flake.lock b/env/wsl/flake.lock deleted file mode 100755 index 42c0437..0000000 --- a/env/wsl/flake.lock +++ /dev/null @@ -1,136 +0,0 @@ -{ - "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1723986931, - "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "home-manager", - "type": "github" - } - }, - "nixos-wsl": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1723124175, - "narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=", - "owner": "nix-community", - "repo": "NixOS-WSL", - "rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "main", - "repo": "NixOS-WSL", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1722087241, - "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8c50662509100d53229d4be607f1a3a31157fa12", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "home-manager": "home-manager", - "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_2" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/env/wsl/flake.nix b/env/wsl/flake.nix deleted file mode 100755 index dc8c0b1..0000000 --- a/env/wsl/flake.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - home-manager = { - url = "github:nix-community/home-manager/master"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; - }; - - outputs = { self, nixpkgs, home-manager, nixos-wsl }: { - 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 { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - } - nixos-wsl.nixosModules.wsl - ./wsl-dev-host.nix - ]; - }; - }; -} diff --git a/env/wsl/kitty_new_window.bat b/env/wsl/kitty_new_window.bat index 698137c..8ebfa8d 100644 --- a/env/wsl/kitty_new_window.bat +++ b/env/wsl/kitty_new_window.bat @@ -1,2 +1,2 @@ @echo off -wscript .\run_hidden.vbs wsl -- sh -c "cd ../..; nix develop .#wsl" +wscript .\run_hidden.vbs wsl -- sh -c "cd ../..; nix develop .#default; kitty" diff --git a/env/wsl/settings.nix b/env/wsl/settings.nix index 362ed1c..51ae8d0 100644 --- a/env/wsl/settings.nix +++ b/env/wsl/settings.nix @@ -1,7 +1,8 @@ { + user = "john"; font = { name = "Consolas"; - size = "12"; + size = 12; baseline = "-1"; }; scheme = import ./ssdog.nix; diff --git a/env/wsl/wsl-dev-host.nix b/env/wsl/wsl-dev-host.nix index afef6a8..fd9a1db 100755 --- a/env/wsl/wsl-dev-host.nix +++ b/env/wsl/wsl-dev-host.nix @@ -1,33 +1,30 @@ { config, lib, pkgs, ... }: let - inherit (import ./settings.nix) scheme font; + inherit (import ./settings.nix) user font scheme; in { - imports = [ ]; + wsl = { + enable = true; + defaultUser = user; + useWindowsDriver = true; + nativeSystemd = true; + }; - system.stateVersion = "24.11"; + users.users.${user}.extraGroups = [ "audio" "video" ]; nix = { settings = { experimental-features = [ "nix-command" "flakes" ]; - trusted-users = [ "john" ]; + trusted-users = [ user ]; }; }; - wsl = { - enable = true; - defaultUser = "john"; - useWindowsDriver = true; - }; - - users.users.john.extraGroups = [ "audio" "video" ]; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - nixpkgs.config.allowUnfree = true; - hardware.enableRedistributableFirmware = true; - boot.supportedFilesystems = [ "ntfs" "nfs" ]; boot.kernelParams = [ "mitigations=off" ]; + nixpkgs.config.allowUnfree = true; + hardware.enableRedistributableFirmware = true; + networking.hostName = "wsl-dev"; networking.firewall.enable = false; @@ -57,7 +54,6 @@ in { vistafonts noto-fonts noto-fonts-extra - noto-fonts-cjk noto-fonts-cjk-sans noto-fonts-cjk-serif noto-fonts-emoji-blob-bin @@ -86,62 +82,38 @@ in { TERMINAL = "kitty"; }; - programs.zsh.enable = true; - environment.shells = [ pkgs.zsh ]; - environment.pathsToLink = [ "/share/zsh" ]; - users.defaultUserShell = pkgs.zsh; - - home-manager.users.john = let - homeDir = "${config.users.users.john.home}"; + home-manager.users.${user} = let + homeDir = "${config.users.users.${user}.home}"; in { - programs.zsh = { + programs.bash = { enable = true; - shellAliases = { - sudo = "nocorrect sudo "; - cmv-next = "cmv-add NEXT"; - cmv-prev = "cmv-add PREV"; - cmv-shuffle = "cmv-add SHUFFLE"; - cmc = "./src/fruits/cmc/cmc"; - }; - defaultKeymap = "emacs"; - history = { - save = 10000; - size = 10000; - path = "${homeDir}/.histfile"; - share = false; - }; - enableCompletion = true; + enableCompletion = false; initExtra = '' - autoload -U colors && colors - setopt prompt_subst - if [[ -v NIX_SHELL ]]; then - PS1="%B($NIX_SHELL) %{$fg[blue]%}%n%{$fg[red]%}@%{$fg[light\ red]%}%M%{$fg[magenta]%}:%~%{$reset_color%}%b " - else - PS1="%B%{$fg[blue]%}%n%{$fg[red]%}@%{$fg[light\ red]%}%M%{$fg[magenta]%}:%~%{$reset_color%}%b " - fi + PS1="\u@\H:\w > " ''; }; programs.kitty = { enable = true; font = { name = font.name; - size = lib.toInt font.size; + size = font.size; }; shellIntegration = { mode = "enabled"; - enableZshIntegration = true; + enableBashIntegration = true; }; extraConfig = '' - enable_audio_bell no - disable_ligatures always - confirm_os_window_close 0 + shell ${pkgs.bashInteractive}/bin/bash --login update_check_interval 0 + confirm_os_window_close 0 + enable_audio_bell no allow_remote_control yes linux_display_server x11 - initial_window_width 640 - initial_window_height 480 + initial_window_width 800 + initial_window_height 600 remember_window_size yes placement_strategy top-left + disable_ligatures always modify_font baseline ${font.baseline} cursor #${scheme.foreground} foreground #${scheme.foreground} @@ -180,4 +152,6 @@ in { }; home.stateVersion = "${config.system.stateVersion}"; }; + + system.stateVersion = "25.05"; } @@ -1,5 +1,60 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732025103, + "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "home-manager", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1731797098, @@ -16,13 +71,50 @@ "type": "github" } }, + "nixos-wsl": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1731682434, + "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=", + "owner": "nix-community", + "repo": "NixOS-WSL", + "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "NixOS-WSL", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -34,8 +126,25 @@ }, "root": { "inputs": { + "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs" + "nixos-wsl": "nixos-wsl", + "nixpkgs": "nixpkgs_2" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" } } }, @@ -6,9 +6,16 @@ nixos-hardware = { url = "github:NixOS/nixos-hardware/master"; }; + nixos-wsl = { + url = "github:nix-community/NixOS-WSL/main"; + }; + home-manager = { + url = "github:nix-community/home-manager/master"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, nixos-hardware }: let + outputs = { self, nixpkgs, nixos-hardware, nixos-wsl, home-manager }: let forAllSupportedSystems = function: nixpkgs.lib.genAttrs [ "x86_64-linux" @@ -118,16 +125,7 @@ buildInputs = packages.${system}.default.buildInputs; shellHook = '' export NIX_SHELL="camu" - unset SOURCE_DATE_EPOCH - exec ${pkgs.zsh}/bin/zsh -l - ''; - }; - - wsl = with pkgs; default // mkShell { - shellHook = '' - export NIX_SHELL="camu-wsl" - unset SOURCE_DATE_EPOCH - exec ${pkgs.kitty}/bin/kitty zsh -l + export PS1="(\$NIX_SHELL)"$PS1 ''; }; @@ -159,8 +157,7 @@ ]; shellHook = '' export NIX_SHELL="camu-mingw64" - unset SOURCE_DATE_EPOCH - exec ${pkgs.zsh}/bin/zsh -l + export PS1="(\$NIX_SHELL)"$PS1 ''; }; @@ -179,8 +176,7 @@ ]; shellHook = '' export NIX_SHELL="camu-mingw32" - unset SOURCE_DATE_EPOCH - exec ${pkgs.zsh}/bin/zsh -l + export PS1="(\$NIX_SHELL)"$PS1 ''; }; @@ -214,14 +210,37 @@ androidComposition.androidsdk ]; shellHook = '' - export NIX_SHELL="camu-android" export PATH="$(echo "$ANDROID_HOME/cmake/${cmakeVersion}"*/bin):$PATH" export PATH="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH" - exec ${pkgs.zsh}/bin/zsh -l + export NIX_SHELL="camu-android" + export PS1="(\$NIX_SHELL)"$PS1 ''; }; }); + # https://github.com/nix-community/NixOS-WSL?tab=readme-ov-file#quick-start + nixosConfigurations.wsl-dev = let + system = "x86_64-linux"; + source-pkgs = nixpkgs.legacyPackages.${system}; + nixpkgs-patched = source-pkgs.applyPatches { + name = "nixpkgs-patched"; + src = nixpkgs; + patches = [ ]; + }; + nixosSystem = import (nixpkgs-patched + "/nixos/lib/eval-config.nix"); + in nixosSystem { + system = system; + modules = [ + ({ pkgs, ... }: { nixpkgs.overlays = [ ]; }) + nixos-wsl.nixosModules.wsl + home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + } + ./env/wsl/wsl-dev-host.nix + ]; + }; + # Raspberry Pi 3 Model B V1.2 + JustBoom Digi HAT nixosConfigurations.cmsb-001 = let system = "aarch64-linux"; @@ -233,7 +252,7 @@ }; nixosSystem = import (nixpkgs-patched + "/nixos/lib/eval-config.nix"); in nixosSystem { - system = "aarch64-linux"; + system = system; modules = [ ({ pkgs, ... }: { nixpkgs.overlays = [ ]; }) nixos-hardware.nixosModules.raspberry-pi-3 diff --git a/hardware/cmsb-001/configuration.nix b/hardware/cmsb-001/configuration.nix index d3525f7..4011a72 100644 --- a/hardware/cmsb-001/configuration.nix +++ b/hardware/cmsb-001/configuration.nix @@ -90,10 +90,7 @@ services.openssh.enable = true; - programs.zsh.enable = true; - environment.shells = [ pkgs.zsh ]; - environment.pathsToLink = [ "/share/zsh" ]; - users.defaultUserShell = pkgs.zsh; + users.defaultUserShell = pkgs.bashInteractive; environment.systemPackages = with pkgs; [ libraspberrypi diff --git a/scripts/run_server.sh b/scripts/run_server.sh index fde98ea..c2f74e5 100755 --- a/scripts/run_server.sh +++ b/scripts/run_server.sh @@ -2,6 +2,7 @@ export CURL_CA_BUNDLE=/etc/ssl/certs/ca-bundle.crt export PYTHONDONTWRITEBYTECODE=1 export PYTHONPATH=$HOME/c/camu/src/portal/vendor/vendor +# screen will use $SHELL. screen -c ../scripts/screenrc #./src/fruits/cmsrv/cmsrv $@ #valgrind --log-file=./server-valgrind.log ./src/fruits/cmsrv/cmsrv $@ diff --git a/subprojects/fontconfig.wrap b/subprojects/fontconfig.wrap index e562096..a71b13e 100644 --- a/subprojects/fontconfig.wrap +++ b/subprojects/fontconfig.wrap @@ -1,6 +1,7 @@ [wrap-git] +directory = fontconfig-2.15.0 url = https://gitlab.freedesktop.org/fontconfig/fontconfig.git -revision = main +revision = 2.15.0 depth = 1 [provide] diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap index 19ee383..1993fdd 100644 --- a/subprojects/freetype2.wrap +++ b/subprojects/freetype2.wrap @@ -1,4 +1,5 @@ [wrap-git] +directory = freetype-2.13.3 url = https://github.com/freetype/freetype.git -revision = master +revision = VER-2-13-3 depth = 1 diff --git a/subprojects/fribidi.wrap b/subprojects/fribidi.wrap index 9633214..45756f8 100644 --- a/subprojects/fribidi.wrap +++ b/subprojects/fribidi.wrap @@ -1,4 +1,5 @@ [wrap-git] +directory = fribidi-1.0.16 url = https://github.com/fribidi/fribidi.git -revision = master +revision = v1.0.16 depth = 1 diff --git a/subprojects/harfbuzz.wrap b/subprojects/harfbuzz.wrap index e58aed4..97107b5 100644 --- a/subprojects/harfbuzz.wrap +++ b/subprojects/harfbuzz.wrap @@ -1,4 +1,5 @@ [wrap-git] +directory = harfbuzz-10.1.0 url = https://github.com/harfbuzz/harfbuzz.git -revision = main +revision = 10.1.0 depth = 1 diff --git a/subprojects/libass.wrap b/subprojects/libass.wrap index df69923..f2aa71c 100644 --- a/subprojects/libass.wrap +++ b/subprojects/libass.wrap @@ -1,4 +1,5 @@ [wrap-git] +directory = libass-0.17.3 url = https://github.com/libass/libass.git revision = 0.17.3 clone-recursive = true |