diff --git a/flake.lock b/flake.lock new file mode 100644 index 000000000..5ba6ab84e --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 000000000..09e5f4701 --- /dev/null +++ b/flake.nix @@ -0,0 +1,37 @@ +{ + description = "Dev shell to help contributing to liana"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils, ... }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { inherit system; }; + in { + devShell = pkgs.mkShell rec { + buildInputs = with pkgs; [ + expat + fontconfig + freetype + freetype.dev + libGL + pkg-config + udev + wayland + libxkbcommon + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + ]; + + LD_LIBRARY_PATH = + builtins.foldl' (a: b: "${a}:${b}/lib") "${pkgs.vulkan-loader}/lib" buildInputs; + }; + } + ); +} + diff --git a/liana-gui/shell.nix b/liana-gui/shell.nix deleted file mode 100644 index 9fc3b5057..000000000 --- a/liana-gui/shell.nix +++ /dev/null @@ -1,32 +0,0 @@ -# Nixos 23.11 comes with libc 2.38, this version of libc may not be compatible -# with some drivers. For now the hack found is to user a community wrapper that -# detects the requirements and do the link (https://github.com/guibou/nixGL). -# usage: -# nixGL cargo run - -let - nixgl = import (fetchTarball "https://github.com/guibou/nixGL/archive/master.tar.gz") {}; - pkgs = import {}; -in -pkgs.mkShell rec { - buildInputs = with pkgs; [ - pkgs.expat - pkgs.fontconfig - pkgs.freetype - pkgs.freetype.dev - pkgs.libGL - pkgs.pkg-config - pkgs.udev - pkgs.wayland - pkgs.libxkbcommon - pkgs.xorg.libX11 - pkgs.xorg.libXcursor - pkgs.xorg.libXi - pkgs.xorg.libXrandr - nixgl.auto.nixGLDefault - ]; - - LD_LIBRARY_PATH = - builtins.foldl' (a: b: "${a}:${b}/lib") "${pkgs.vulkan-loader}/lib" buildInputs; -} -