Clean up nix dev shells

This commit is contained in:
joachimschmidt557 2023-01-19 18:56:19 +01:00
parent c544c44fce
commit d37b473dcc
No known key found for this signature in database
GPG key ID: E0B575BE2884ACC5
5 changed files with 10 additions and 57 deletions

View file

@ -60,11 +60,12 @@
devShells = { devShells = {
aby = import ./nix/aby.nix { pkgs = pkgs; }; aby = import ./nix/aby.nix { pkgs = pkgs; };
basic-cmake = import ./nix/basic-cmake.nix { pkgs = pkgs; };
basic-rust = import ./nix/basic-rust.nix { pkgs = pkgs; };
empty = import ./nix/empty.nix { pkgs = pkgs; }; empty = import ./nix/empty.nix { pkgs = pkgs; };
spfe = import ./nix/spfe.nix { pkgs = pkgs; }; spfe = import ./nix/spfe.nix { pkgs = pkgs; };
zig = import ./nix/zig.nix { pkgs = pkgs; };
zig-bootstrap = import ./nix/zig-bootstrap.nix { pkgs = pkgs; }; zig-bootstrap = import ./nix/zig-bootstrap.nix { pkgs = pkgs; };
rusty = import ./nix/rusty.nix { pkgs = pkgs; }; zig = import ./nix/zig.nix { pkgs = pkgs; };
}; };
}) // { }) // {

7
nix/basic-cmake.nix Normal file
View file

@ -0,0 +1,7 @@
{ pkgs }:
pkgs.mkShell {
buildInputs = with pkgs; [
cmake
];
}

View file

@ -1,16 +0,0 @@
{ pkgs ? import <nixpkgs> { } }:
with pkgs;
buildGoModule rec {
pname = "laplace";
version = "0.0.1";
src = fetchFromGitHub {
owner = "adamyordan";
repo = pname;
rev = "6d877051e28fd25f9ab85ed2cfbe31d76d857be3";
sha256 = "0l7w7my64yi2pig8sdxgk8049ah3n1mb2wfw858ys3gk42xqa5xh";
};
vendorSha256 = "022bil46fyjsd18diw0rnab987sp1ialb48rj18ksj75ghjqkr62";
}

View file

@ -1,39 +0,0 @@
{ pkgs ? import <nixpkgs> { } }:
pkgs.stdenv.mkDerivation rec {
pname = "river";
version = "master";
src = ./.;
# src = builtins.fetchGit {
# url = "https://github.com/ifreund/river";
# ref = "master";
# };
nativeBuildInputs = with pkgs; [
pkg-config
];
buildInputs = with pkgs; [
zig
wayland
wayland-protocols
wlroots
libxkbcommon
pixman
libudev
xorg.libX11
libGL
libevdev
scdoc
];
buildPhase = ''
export HOME=$TMPDIR
zig build -Drelease-safe -Dxwayland -Dman-pages
'';
installPhase = ''
zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install
'';
}