diff --git a/flake.lock b/flake.lock index 762544c..132287b 100644 --- a/flake.lock +++ b/flake.lock @@ -34,26 +34,10 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1719942202, - "narHash": "sha256-7sP4PzxRsUfRwN8rmFtRvU/nYqTI5YYeIG9P3KJV41g=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4b015946c99a5bbe9c7a685e66f165aa44644b7d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "zlsPkg": "zlsPkg" + "nixpkgs": "nixpkgs" } }, "systems": { @@ -70,21 +54,6 @@ "repo": "default", "type": "github" } - }, - "zlsPkg": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-40mzryp9AaDiufsbEISP5VJCEpg0DYrdMjpP16oSJj0=", - "path": "./nix/zls", - "type": "path" - }, - "original": { - "path": "./nix/zls", - "type": "path" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e99f586..2abcd4c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,20 +2,17 @@ description = "Zig flake with ZLS"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.zlsPkg.url = "path:./nix/zls"; outputs = { flake-utils, nixpkgs, - zlsPkg, ... }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; - zls = zlsPkg.defaultPackage.${system}; in { - devShell = pkgs.mkShell rec { + devShell = pkgs.mkShell { buildInputs = with pkgs; [ lldb SDL2 @@ -28,8 +25,8 @@ zig zls ]; - LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs; - C_INCLUDE_PATH = "${pkgs.SDL2}/include:${pkgs.SDL2_ttf}/include:${pkgs.SDL2_image}/include"; + # LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs; + # C_INCLUDE_PATH = "${pkgs.SDL2}/include:${pkgs.SDL2_ttf}/include:${pkgs.SDL2_image}/include"; }; }); } diff --git a/nix/zls/flake.lock b/nix/zls/flake.lock deleted file mode 100644 index 188887d..0000000 --- a/nix/zls/flake.lock +++ /dev/null @@ -1,26 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1719942202, - "narHash": "sha256-7sP4PzxRsUfRwN8rmFtRvU/nYqTI5YYeIG9P3KJV41g=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4b015946c99a5bbe9c7a685e66f165aa44644b7d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/nix/zls/flake.nix b/nix/zls/flake.nix deleted file mode 100644 index 921bf0b..0000000 --- a/nix/zls/flake.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - description = "Zig language server"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs"; - }; - - outputs = {self, nixpkgs}: { - defaultPackage.x86_64-linux = - with import nixpkgs { system = "x86_64-linux"; }; - - stdenv.mkDerivation rec { - name = "zls-${version}"; - version = "0.13.0"; - src = pkgs.fetchurl { - url = "https://github.com/zigtools/zls/releases/download/${version}/zls-x86_64-linux.tar.xz"; - sha256 = "sha256-7EwbRcr4jivLnrsWxnBgPMWW5PYhuWGE376DeznNhBA="; - }; - - sourceRoot = "."; - - installPhase = '' - install -m755 -D zls $out/bin/zls - ''; - - meta = with lib; { - homepage = "https://github.com/zigtools/zls/releases"; - description = "Zig language server"; - platforms = platforms.linux; - }; - }; - }; -}