summaryrefslogtreecommitdiffstats
path: root/default.nix
diff options
context:
space:
mode:
authorCole Mickens <cole.mickens@gmail.com>2019-06-03 12:50:20 -0700
committerCole Mickens <cole.mickens@gmail.com>2019-06-03 12:50:20 -0700
commit3cf7515ceb6da18dfa72b03aa8981e362c6b5067 (patch)
treedbfeb39f74b17f86f7cc4f0a87b7c0f097cafaaf /default.nix
parent589d16b720eee6bf7788e6cea3e0889e16589a25 (diff)
updates; add alacritty
Diffstat (limited to 'default.nix')
-rw-r--r--default.nix14
1 files changed, 11 insertions, 3 deletions
diff --git a/default.nix b/default.nix
index a1e37e9..724bfb7 100644
--- a/default.nix
+++ b/default.nix
@@ -2,8 +2,7 @@ self: pkgs:
let
waylandPkgs = rec {
# temp
- sway-beta = sway;
- spdlog = (pkgs.callPackage ./pkgs-temp/spdlog {}).spdlog_1;
+ wlroots_060 = pkgs.callPackage ./pkgs-temp/wlroots-0.6.0 {};
# wlroots-related
scdoc = pkgs.callPackage ./pkgs/scdoc {};
@@ -20,7 +19,7 @@ waylandPkgs = rec {
oguri = pkgs.callPackage ./pkgs/oguri {};
waybar = pkgs.callPackage ./pkgs/waybar {};
wf-config = pkgs.callPackage ./pkgs/wf-config {};
- wayfire = pkgs.callPackage ./pkgs/wayfire {};
+ wayfire = pkgs.callPackage ./pkgs/wayfire { wlroots = wlroots_060; };
redshift-wayland = pkgs.callPackage ./pkgs/redshift-wayland {
inherit (pkgs.python3Packages) python pygobject3 pyxdg wrapPython;
geoclue = pkgs.geoclue2;
@@ -36,6 +35,15 @@ waylandPkgs = rec {
glpaper = pkgs.callPackage ./pkgs/glpaper {};
wlrobs = pkgs.callPackage ./pkgs/wlrobs {};
+
+ alacritty = pkgs.callPackage ./pkgs/alacritty {
+ inherit (pkgs.xorg) libXcursor libXxf86vm libXi libxcb;
+ inherit (pkgs.darwin) cf-private;
+ inherit (pkgs.darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL;
+ };
};
in
waylandPkgs // { inherit waylandPkgs; }
+# TODO: I think adding a waylandPkgs *against* a channel would let
+#me combine build.nix in here, and make it easier for others ot use it as
+#a straight pkg list instead of just the current 'waylandPkgs' overlay