From b953a1b4b5d5bb891c714cd51985e40863d7de87 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sat, 29 Dec 2018 15:42:38 -0800
Subject: update most packages

wlroots matches upstream nixpkgs (no longer needs custom meson48)
wayfire now temporarily uses an old, pinned wlroots
packages updated:
  - fmt
  - wlroots
  - sway-beta
  - grim
  - oguri
  - waybar
  - wayfire / wf-config
  - bspwc
  - waybox
  - wl-clipboard
  - wmfocus
  - i3status-rust

Signed-off-by: Cole Mickens <cole.mickens@gmail.com>
---
 default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 363200d..909790b 100644
--- a/default.nix
+++ b/default.nix
@@ -1,11 +1,12 @@
 self: pkgs:
 let
-waylandPkgs = {
+waylandPkgs = rec {
   # patched deps
   fmt              = pkgs.callPackage ./pkgs/fmt {};
 
   # wlroots-related
   wlroots          = pkgs.callPackage ./pkgs/wlroots {};
+  wlroots-old      = pkgs.callPackage ./pkgs-temp/wlroots {};
   sway-beta        = pkgs.callPackage ./pkgs/sway-beta {};
   grim             = pkgs.callPackage ./pkgs/grim {};
   slurp            = pkgs.callPackage ./pkgs/slurp {};
@@ -15,7 +16,7 @@ waylandPkgs = {
   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-old; };
   redshift-wayland = pkgs.callPackage ./pkgs/redshift-wayland {
     inherit (pkgs.python3Packages) python pygobject3 pyxdg wrapPython;
     geoclue = pkgs.geoclue2;
-- 
cgit v1.2.3