Skip to content

Commit

Permalink
Merge #1481: Use a flake instead of shell nix
Browse files Browse the repository at this point in the history
bd6e6f4 Use a flake instead of shell nix (edouardparis)

Pull request description:

  A flake makes more sense for development with nix declarative systems.
  To launch the shell: do `nix develop`

ACKs for top commit:
  edouardparis:
    Self-ACK bd6e6f4

Tree-SHA512: e9d81ee2e7e6e08a7ea6eca3ae8c5b5d58de517dd5615d6c73578832bd1d2e1e9a9c99781079d48683268fd93647b8a95f70cfafabf818f08321410961ee38f0
  • Loading branch information
edouardparis committed Nov 21, 2024
2 parents 1f7c41a + bd6e6f4 commit e246305
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 32 deletions.
61 changes: 61 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 37 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -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;
};
}
);
}

32 changes: 0 additions & 32 deletions liana-gui/shell.nix

This file was deleted.

0 comments on commit e246305

Please sign in to comment.