Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#192197 follow ups #2 #212613

Closed
wants to merge 2 commits into from
Closed

#192197 follow ups #2 #212613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0763113
sway: simplify systemdSupport condition
SuperSandro2000 Jan 25, 2023
39b7b10
beamPackages: remove interpreter option from package set
SuperSandro2000 Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/applications/window-managers/sway/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions pkgs/top-level/beam-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
, wxGTK32
, buildPackages
, stdenv
, wxSupport ? true
, systemd
, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
}:

let
Expand All @@ -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; };
Expand All @@ -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; };
Expand All @@ -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; };
Expand All @@ -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; };
Expand All @@ -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; };
Expand Down