From 65ff33b213ff1629c506d62cecf5956ef229b366 Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Wed, 30 Oct 2024 09:37:58 +0100 Subject: [PATCH] nix update --- flake.lock | 6 +++--- nix/cgnix/nvim-plugins.nix | 35 ++++++++++++++++++----------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index acb4f6b..b6871a3 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1728228884, - "narHash": "sha256-E9JaDKGi21oUypH0P9881lbkhi6USNJ6XL2tFzU5uuE=", + "lastModified": 1730207978, + "narHash": "sha256-FnFkAqwoXfBoyWGBIVy17rT6sJK8HI09SlPmh6WKYJo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff0da78cfd41aa1784910ce1fea89119822013ce", + "rev": "6a1c602a1637c3b22c8a0b7123413ad84d7c51fe", "type": "github" }, "original": { diff --git a/nix/cgnix/nvim-plugins.nix b/nix/cgnix/nvim-plugins.nix index ea1400b..ffacfed 100644 --- a/nix/cgnix/nvim-plugins.nix +++ b/nix/cgnix/nvim-plugins.nix @@ -60,22 +60,23 @@ let "10-nui" = plugin "nui.nvim"; }; - mzte-nv-compiler = - let - path = "${builtins.getEnv "HOME"}/.local/bin/mzte-nv-compile"; - in - if (builtins.pathExists path) then - # This derivation exists to patch a potentially mismatched dynamic linker. - stdenvNoCC.mkDerivation - { - name = "mzte-nv-compiler-patched"; - nativeBuildInputs = [ pkgs.autoPatchelfHook ]; - buildInputs = with pkgs; [ luajit ]; - dontUnpack = true; - buildPhase = '' - cp ${/. + path} $out - ''; - } else ""; + # TODO: build mzte-nv-compiler in nix + #mzte-nv-compiler = + # let + # path = "${builtins.getEnv "HOME"}/.local/bin/mzte-nv-compile"; + # in + # if (builtins.pathExists path) then + # # This derivation exists to patch a potentially mismatched dynamic linker. + # stdenvNoCC.mkDerivation + # { + # name = "mzte-nv-compiler-patched"; + # nativeBuildInputs = [ pkgs.autoPatchelfHook ]; + # buildInputs = with pkgs; [ luajit ]; + # dontUnpack = true; + # buildPhase = '' + # cp ${/. + path} $out + # ''; + # } else ""; in { options.cgnix.nvim-plugins = lib.mkOption { }; @@ -97,7 +98,7 @@ in buildPhase = '' # Compile - ${if mzte-nv-compiler != "" then "${mzte-nv-compiler} plugins" else ""} + #$ {if mzte-nv-compiler != "" then "$ {mzte-nv-compiler} plugins" else ""} ''; installPhase = ''