diff options
author | Robert Hensing <roberth@users.noreply.github.com> | 2023-08-02 20:05:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-02 20:05:52 +0200 |
commit | f8f9f13d57e264aed3896a0229e94111fe82c6f7 (patch) | |
tree | b785c4ee6025ee0a8049306810f19761cbc170f8 /pkgs/servers | |
parent | c5488691867569443a065b45ab2991b6c40f9435 (diff) | |
parent | 0ed9e35a220b9de5b9462deba3900605e174809d (diff) |
Merge pull request #246386 from hercules-ci/lib-getExe-dont-make-name-assumption
lib.getExe: Do not make assumptions about the main program
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/code-server/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/consul/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/dns/acme-dns/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/ldap/lldap/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/monitoring/grafana-agent/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/openvscode-server/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/pufferpanel/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/web-apps/kavita/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 10 |
9 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 990ab50f28bc0..0c5cb23108520 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -322,5 +322,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ offline henkery code-asher ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + mainProgram = "code-server"; }; }) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 1f9b68060321b..6f145137567a5 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -42,5 +42,6 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 techknowlogick]; + mainProgram = "consul"; }; } diff --git a/pkgs/servers/dns/acme-dns/default.nix b/pkgs/servers/dns/acme-dns/default.nix index 08cd511f18274..db6ea4bbea009 100644 --- a/pkgs/servers/dns/acme-dns/default.nix +++ b/pkgs/servers/dns/acme-dns/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { changelog = "https://github.com/joohoi/acme-dns/releases/tag/${src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ emilylange ]; + mainProgram = "acme-dns"; }; } diff --git a/pkgs/servers/ldap/lldap/default.nix b/pkgs/servers/ldap/lldap/default.nix index 1948ca015dda8..3c83fe037a0d7 100644 --- a/pkgs/servers/ldap/lldap/default.nix +++ b/pkgs/servers/ldap/lldap/default.nix @@ -110,5 +110,6 @@ in rustPlatform.buildRustPackage (commonDerivationAttrs // { license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ emilylange bendlas ]; + mainProgram = "lldap"; }; }) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 3859c2df59652..e07621e8213d0 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -73,5 +73,6 @@ buildGoModule rec { homepage = "https://grafana.com/products/cloud"; changelog = "https://github.com/grafana/agent/blob/${src.rev}/CHANGELOG.md"; maintainers = with lib.maintainers; [ flokli emilylange ]; + mainProgram = "grafana-agent"; }; } diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index 8ce4b7676e447..43f9d7a7fe739 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -219,5 +219,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ dguenther ghuntley emilytrau ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + mainProgram = "openvscode-server"; }; }) diff --git a/pkgs/servers/pufferpanel/default.nix b/pkgs/servers/pufferpanel/default.nix index f1079a03fcece..d3420f90db543 100644 --- a/pkgs/servers/pufferpanel/default.nix +++ b/pkgs/servers/pufferpanel/default.nix @@ -98,5 +98,6 @@ buildGoModule rec { homepage = "https://www.pufferpanel.com/"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ ckie tie ]; + mainProgram = "pufferpanel"; }; } diff --git a/pkgs/servers/web-apps/kavita/default.nix b/pkgs/servers/web-apps/kavita/default.nix index 81f07c2131919..c7d6e7b9567c3 100644 --- a/pkgs/servers/web-apps/kavita/default.nix +++ b/pkgs/servers/web-apps/kavita/default.nix @@ -73,5 +73,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ misterio77 ]; + mainProgram = "kavita"; }; }) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 9010d63d5c67e..aebfc73c5c116 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -161,6 +161,9 @@ self: super: + lib.optionalString stdenv.hostPlatform.isStatic '' export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lXau -lXdmcp" ''; + meta = attrs.meta // { + mainProgram = "xdpyinfo"; + }; }); xdm = super.xdm.overrideAttrs (attrs: { @@ -814,6 +817,7 @@ self: super: --replace '_X_NORETURN' '__attribute__((noreturn))' \ --replace 'n_dirs--;' "" ''; + meta.mainProgram = "lndir"; }); twm = super.twm.overrideAttrs (attrs: { @@ -940,6 +944,12 @@ self: super: ''; }); + xset = super.xset.overrideAttrs (attrs: { + meta = attrs.meta // { + mainProgram = "xset"; + }; + }); + # convert Type1 vector fonts to OpenType fonts fontbitstreamtype1 = super.fontbitstreamtype1.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ fontforge ]; |