n8r/zsdl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated flake, removed seperate ZLS install and am just installing from nixpkgs now

Browse Source
This commit is contained in:
Nate Anderson 2025-01-02 10:45:48 -07:00
parent a335d10f9f
commit f2bf87c063
4 changed files with 4 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
flake.lock generated
View File

@ -34,26 +34,10 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"zlsPkg": "zlsPkg"
} }
}, },
"systems": { "systems": {
@ -70,21 +54,6 @@
"repo": "default", "repo": "default",
"type": "github" "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", "root": "root",

9
flake.nix
View File

@ -2,20 +2,17 @@
description = "Zig flake with ZLS"; description = "Zig flake with ZLS";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.zlsPkg.url = "path:./nix/zls";
outputs = { outputs = {
flake-utils, flake-utils,
nixpkgs, nixpkgs,
zlsPkg,
... ...
}: }:
flake-utils.lib.eachDefaultSystem (system: let flake-utils.lib.eachDefaultSystem (system: let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
}; };
zls = zlsPkg.defaultPackage.${system};
in { in {
devShell = pkgs.mkShell rec { devShell = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
lldb lldb
SDL2 SDL2
@ -28,8 +25,8 @@
zig zig
zls zls
]; ];
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs; # LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
C_INCLUDE_PATH = "${pkgs.SDL2}/include:${pkgs.SDL2_ttf}/include:${pkgs.SDL2_image}/include"; # C_INCLUDE_PATH = "${pkgs.SDL2}/include:${pkgs.SDL2_ttf}/include:${pkgs.SDL2_image}/include";
}; };
}); });
} }

26
nix/zls/flake.lock generated
View File

@ -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
}

33
nix/zls/flake.nix
View File

@ -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;
};
};
};
}