2
0
ruki 4 жил өмнө
parent
commit
7e6285e5f3

+ 0 - 1
.github/workflows/fedora.yml

@@ -26,7 +26,6 @@ jobs:
           dnf -y install perl
           dnf -y install perl
           dnf -y install libffi-devel
           dnf -y install libffi-devel
           dnf -y install zlib-devel
           dnf -y install zlib-devel
-          dnf -y install libxft-dev
       - uses: actions/checkout@v1
       - uses: actions/checkout@v1
       - uses: xmake-io/github-action-setup-xmake@v1
       - uses: xmake-io/github-action-setup-xmake@v1
         with:
         with:

+ 2 - 2
packages/n/nana/xmake.lua

@@ -23,8 +23,8 @@ package("nana")
         add_syslinks("ole32", "shell32", "kernel32", "user32", "gdi32", "winspool", "comdlg32", "advapi32")
         add_syslinks("ole32", "shell32", "kernel32", "user32", "gdi32", "winspool", "comdlg32", "advapi32")
         add_defines("_SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING")
         add_defines("_SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING")
     elseif is_plat("linux") then
     elseif is_plat("linux") then
-        add_deps("libxcursor")
-        add_syslinks("pthread", "fontconfig", "Xft")
+        add_deps("libxcursor", "libxft", "fontconfig")
+        add_syslinks("pthread")
     end
     end
 
 
     on_load("linux", "windows", function (package)
     on_load("linux", "windows", function (package)