From 51deae41cc4ac070c3aba0a1ee75dbf3cd4a0858 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Sun, 3 Jan 2021 00:02:28 -0700 Subject: [PATCH] overlays: fix darkwin builds --- overlays/redshift.nix | 4 ++-- overlays/retroarchBare.nix | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/overlays/redshift.nix b/overlays/redshift.nix index e6e4f73..fa05132 100644 --- a/overlays/redshift.nix +++ b/overlays/redshift.nix @@ -1,11 +1,11 @@ final: prev: { # with sway/wayland support - redshift = prev.redshift.overrideAttrs (o: { + redshift = (prev.redshift.overrideAttrs (o: { src = prev.fetchFromGitHub { owner = "minus7"; repo = "redshift"; rev = "wayland"; hash = "sha256-pyR7xNdi/83NSoC2WIrX8U+A6nU+vZBlePLXrQZnc1k="; }; - }); + })).override { withAppIndicator = prev.stdenv.isLinux; }; } diff --git a/overlays/retroarchBare.nix b/overlays/retroarchBare.nix index 90bf61c..ea6c656 100644 --- a/overlays/retroarchBare.nix +++ b/overlays/retroarchBare.nix @@ -10,5 +10,14 @@ final: prev: { hash = "sha256-dzPOuT+v1JtYzvAtqZ/eVWQSYQLAWX3TyS3jXdBmDdg="; rev = "v${version}"; }; + + # fix darwin builds + nativeBuildInputs = + if ! prev.stdenv.isLinux then + prev.lib.filter + (drv: ! prev.lib.hasPrefix "wayland" drv.name) + o.nativeBuildInputs + else + o.nativeBuildInputs; }); }