diff options
| author | figsoda <figsoda@pm.me> | 2021-11-16 21:00:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 21:00:48 -0500 |
| commit | 6ad04bcb7d3a198c63823e037138013503e089fd (patch) | |
| tree | 21bc7ae1e598ae53e7758aaf0ec41156bdc749c3 /pkgs/applications/window-managers | |
| parent | 141d3fc04ff684095d03675231ef6f102444f633 (diff) | |
| parent | 0e9320dc5f2cf9914711ff44f1251a4c7bd0d30b (diff) | |
| download | nixpkgs-6ad04bcb7d3a198c63823e037138013503e089fd.tar nixpkgs-6ad04bcb7d3a198c63823e037138013503e089fd.tar.gz nixpkgs-6ad04bcb7d3a198c63823e037138013503e089fd.tar.bz2 nixpkgs-6ad04bcb7d3a198c63823e037138013503e089fd.tar.lz nixpkgs-6ad04bcb7d3a198c63823e037138013503e089fd.tar.xz nixpkgs-6ad04bcb7d3a198c63823e037138013503e089fd.tar.zst nixpkgs-6ad04bcb7d3a198c63823e037138013503e089fd.zip | |
Merge pull request #146243 from figsoda/treewide-rust-feature
treewide: use buildFeatures and checkFeatures for rust packages
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"; |