diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-08-27 14:29:39 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-08-27 14:35:47 +0000 |
commit | 8814bf8bcce4b48fb4622a5188016aef81ea9685 (patch) | |
tree | cb915bdc383232d36e12264a0437b714669b4bd1 | |
parent | 23fa25640d5c67092f50d9f1663f832f8ea70bfe (diff) | |
download | nixpkgs-8814bf8bcce4b48fb4622a5188016aef81ea9685.tar nixpkgs-8814bf8bcce4b48fb4622a5188016aef81ea9685.tar.gz nixpkgs-8814bf8bcce4b48fb4622a5188016aef81ea9685.tar.bz2 nixpkgs-8814bf8bcce4b48fb4622a5188016aef81ea9685.tar.lz nixpkgs-8814bf8bcce4b48fb4622a5188016aef81ea9685.tar.xz nixpkgs-8814bf8bcce4b48fb4622a5188016aef81ea9685.tar.zst nixpkgs-8814bf8bcce4b48fb4622a5188016aef81ea9685.zip |
wcm: fix (some) icons
strictDeps is incompatible with wrapGAppsHook, so we have to drop that.
-rw-r--r-- | pkgs/applications/window-managers/wayfire/wcm.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/window-managers/wayfire/wf-config.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/window-managers/wayfire/wf-shell.nix | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index d8ffe22d58c..cb0946cd88a 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, wayland +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, wayland, wrapGAppsHook , gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell }: @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1b22gymqfn0c49nf39676q5bj25rxab874iayiq31cmn14r30dyg"; }; - strictDeps = true; - nativeBuildInputs = [ meson ninja pkg-config wayland ]; + nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ]; buildInputs = [ gnome3.gtk libevdev libxml2 wayfire wayland wayland-protocols wf-config wf-shell diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix index dad9c555f5e..8962ab096ab 100644 --- a/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0xbvfy31pl6mj0nac921gqksyh6jb8ccap30p94lw6r6fb17wz57"; }; - strictDeps = true; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libevdev libxml2 ]; propagatedBuildInputs = [ glm ]; diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index 2cb1c1f1a1c..2087402fa70 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { sha256 = "1w4jhy84v9ky9s1iw36msn8189a3pwkvvivyhl44pfc4fy31wj7s"; }; - strictDeps = true; nativeBuildInputs = [ meson ninja pkg-config wayland ]; buildInputs = [ alsaLib gnome3.gtkmm gtk-layer-shell pulseaudio wayfire wf-config |