From 0763113b3b49d9aea77624c5ac8c9fa8f1db8512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 25 Jan 2023 14:49:27 +0100 Subject: [PATCH 1/2] sway: simplify systemdSupport condition sway is only available on linux and there systemd is available. No need to overcomplicate things. --- pkgs/applications/window-managers/sway/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 6cfc55240222a..fd5bc2e121fb9 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -7,7 +7,7 @@ # Used by the NixOS module: , isNixOS ? false , enableXWayland ? true, xorg -, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd +, systemdSupport ? true , dbusSupport ? true , dbus , trayEnabled ? systemdSupport && dbusSupport From 39b7b1057fb44cd15d847ba5caed2d384e21036c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 25 Jan 2023 14:53:04 +0100 Subject: [PATCH 2/2] beamPackages: remove interpreter option from package set --- pkgs/top-level/beam-packages.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index c727db80db6ae..fad6f3438c816 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -5,9 +5,6 @@ , wxGTK32 , buildPackages , stdenv -, wxSupport ? true -, systemd -, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd }: let @@ -34,7 +31,6 @@ in wxGTK = wxGTK32; parallelBuild = true; autoconf = buildPackages.autoconf269; - inherit wxSupport systemdSupport; }; erlangR25_odbc = self.interpreters.erlangR25.override { odbcSupport = true; }; erlangR25_javac = self.interpreters.erlangR25.override { javacSupport = true; }; @@ -49,7 +45,6 @@ in # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; - inherit wxSupport systemdSupport; }; erlangR24_odbc = self.interpreters.erlangR24.override { odbcSupport = true; }; erlangR24_javac = self.interpreters.erlangR24.override { javacSupport = true; }; @@ -65,7 +60,6 @@ in # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; - inherit wxSupport systemdSupport; }; erlangR23_odbc = self.interpreters.erlangR23.override { odbcSupport = true; }; erlangR23_javac = self.interpreters.erlangR23.override { javacSupport = true; }; @@ -81,7 +75,6 @@ in # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; - inherit wxSupport systemdSupport; }; erlangR22_odbc = self.interpreters.erlangR22.override { odbcSupport = true; }; erlangR22_javac = self.interpreters.erlangR22.override { javacSupport = true; }; @@ -95,7 +88,6 @@ in openssl = openssl_1_1; wxGTK = wxGTK32; autoconf = buildPackages.autoconf269; - inherit wxSupport systemdSupport; }; erlangR21_odbc = self.interpreters.erlangR21.override { odbcSupport = true; }; erlangR21_javac = self.interpreters.erlangR21.override { javacSupport = true; };