diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-17 06:01:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-17 06:01:28 +0000 |
| commit | f8cf67790e37ea0e5dd1d84755d89f45417fcff8 (patch) | |
| tree | 4374cc0b47c7793c9b31f240ee21510691cd4bfe /pkgs/applications/window-managers | |
| parent | 485e62c1840ba0b3d96774c100ee4df311a1a71e (diff) | |
| parent | 2e7f48aabfa54fe37510a7922cfba14e3d600c83 (diff) | |
| download | nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar.gz nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar.bz2 nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar.lz nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar.xz nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar.zst nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/eww/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/i3/status-rust.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/i3/wmfocus.nix | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix index c2cc2f23cdb..a987c6c2e0e 100644 --- a/pkgs/applications/window-managers/eww/default.nix +++ b/pkgs/applications/window-managers/eww/default.nix @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gtk3 ] ++ lib.optional withWayland gtk-layer-shell; - cargoBuildFlags = [ "--bin" "eww" ] ++ lib.optionals withWayland [ - "--no-default-features" - "--features=wayland" - ]; + buildNoDefaultFeatures = withWayland; + buildFeatures = lib.optional withWayland "wayland"; + + cargoBuildFlags = [ "--bin" "eww" ]; cargoTestFlags = cargoBuildFlags; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index defb44f0f35..a285c4b5a54 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -27,10 +27,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ dbus libpulseaudio notmuch openssl ]; - cargoBuildFlags = [ - "--features=notmuch" - "--features=maildir" - "--features=pulseaudio" + buildFeatures = [ + "notmuch" + "maildir" + "pulseaudio" ]; prePatch = '' diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index 6756afb4a5c..9c33c555353 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { # For now, this is the only available featureset. This is also why the file is # in the i3 folder, even though it might be useful for more than just i3 # users. - cargoBuildFlags = [ "--features i3" ]; + buildFeatures = [ "i3" ]; meta = with lib; { description = "Visually focus windows by label"; |