Update nix

Riey · Jul 30, 2024 · a741110 · a741110
1 parent eca3776
commit a741110
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 16 deletions.
diff --git a/default.nix b/default.nix
@@ -8,7 +8,7 @@ let
   testArgs = if debug then "" else "--release";
 in
 with pkgs;
-llvmPackages_14.stdenv.mkDerivation rec {
+llvmPackages_18.stdenv.mkDerivation rec {
   name = "kime";
   src = ./.;
   buildInputs = deps.kimeBuildInputs;
@@ -17,9 +17,9 @@ llvmPackages_14.stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     #sha256 = "0000000000000000000000000000000000000000000000000000";
-    sha256 = "sha256-/o9b7YvrpV+IujkllFWAz6Mg4CbS9BInF8antfZ0Vsw=";
+    sha256 = "sha256-hlTxyaE/300CBGIJtFzIh6CT5PcmmqWt8CN428sr2U8=";
   };
-  LIBCLANG_PATH = "${pkgs.llvmPackages_14.libclang.lib}/lib";
+  LIBCLANG_PATH = "${pkgs.llvmPackages_18.libclang.lib}/lib";
   dontUseCmakeConfigure = true;
   dontWrapQtApps = true;
   buildPhase = if debug then "bash scripts/build.sh -ad" else "bash scripts/build.sh -ar";

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "A very basic flake";
+  description = "Korean IME";
 
   inputs = {
     nixpkgs.url = github:NixOS/nixpkgs;

diff --git a/nix/deps.nix b/nix/deps.nix
@@ -20,9 +20,9 @@ with pkgs;
   kimeNativeBuildInputs = [
     python3 # xcb 0.9.0
     pkg-config
-    llvmPackages_14.clang
-    llvmPackages_14.libclang.lib
-    llvmPackages_14.bintools
+    llvmPackages_18.clang
+    llvmPackages_18.libclang.lib
+    llvmPackages_18.bintools
     rustc cargo
     cmake
     extra-cmake-modules

diff --git a/shell.nix b/shell.nix
@@ -3,7 +3,7 @@
 }:
 let
   deps = import ./nix/deps.nix { pkgs = pkgs; };
-  stdenv = pkgs.llvmPackages_14.stdenv;
+  stdenv = pkgs.llvmPackages_18.stdenv;
   mkShell = (pkgs.mkShell.override { stdenv = stdenv; });
 in
 mkShell {
@@ -14,10 +14,10 @@ mkShell {
   nativeBuildInputs = deps.kimeNativeBuildInputs ++ (with pkgs; [
     rustfmt
     gnome.gedit
-    llvmPackages_14.lldb
+    llvmPackages_18.lldb
   ]);
   CMAKE_EXPORT_COMPILE_COMMANDS = 1;
-  LIBCLANG_PATH = "${pkgs.llvmPackages_14.libclang.lib}/lib";
+  LIBCLANG_PATH = "${pkgs.llvmPackages_18.libclang.lib}/lib";
   LD_LIBRARY_PATH = "./target/debug:${pkgs.wayland}/lib:${pkgs.libGL}/lib:${pkgs.libxkbcommon}/lib";
   G_MESSAGES_DEBUG = "kime";
   GTK_IM_MODULE = "kime";