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/applications/networking | |
| parent | c5488691867569443a065b45ab2991b6c40f9435 (diff) | |
| parent | 0ed9e35a220b9de5b9462deba3900605e174809d (diff) | |
| download | nixpkgs-f8f9f13d57e264aed3896a0229e94111fe82c6f7.tar nixpkgs-f8f9f13d57e264aed3896a0229e94111fe82c6f7.tar.gz nixpkgs-f8f9f13d57e264aed3896a0229e94111fe82c6f7.tar.bz2 nixpkgs-f8f9f13d57e264aed3896a0229e94111fe82c6f7.tar.lz nixpkgs-f8f9f13d57e264aed3896a0229e94111fe82c6f7.tar.xz nixpkgs-f8f9f13d57e264aed3896a0229e94111fe82c6f7.tar.zst nixpkgs-f8f9f13d57e264aed3896a0229e94111fe82c6f7.zip | |
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/applications/networking')
4 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 13bbf7da085..7b839cdfcb2 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -20,6 +20,7 @@ # not in `badPlatforms` because cross-compilation on 64-bit machine might work. maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; + mainProgram = "firefox"; }; tests = [ nixosTests.firefox ]; updateScript = callPackage ./update.nix { @@ -46,6 +47,7 @@ # not in `badPlatforms` because cross-compilation on 64-bit machine might work. maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; + mainProgram = "firefox"; }; tests = [ nixosTests.firefox-beta ]; updateScript = callPackage ./update.nix { @@ -74,6 +76,7 @@ # not in `badPlatforms` because cross-compilation on 64-bit machine might work. maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; + mainProgram = "firefox"; }; tests = [ nixosTests.firefox-devedition ]; updateScript = callPackage ./update.nix { @@ -104,6 +107,7 @@ broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = lib.licenses.mpl20; + mainProgram = "firefox"; }; tests = [ nixosTests.firefox-esr-102 ]; updateScript = callPackage ./update.nix { @@ -132,6 +136,7 @@ broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = lib.licenses.mpl20; + mainProgram = "firefox"; }; tests = [ nixosTests.firefox-esr-115 ]; updateScript = callPackage ./update.nix { diff --git a/pkgs/applications/networking/clash-verge/default.nix b/pkgs/applications/networking/clash-verge/default.nix index 7869ed9a1f7..bbe36cb0d66 100644 --- a/pkgs/applications/networking/clash-verge/default.nix +++ b/pkgs/applications/networking/clash-verge/default.nix @@ -60,5 +60,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ zendo ]; + mainProgram = "clash-verge"; }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 236ceaa0a78..ce94764ed9b 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -18,6 +18,7 @@ let { pythonInterpreter = "${python3.interpreter}"; configDirName = lib.toLower binaryName; + meta.mainProgram = "disable-breaking-updates.py"; } '' mkdir -p $out/bin cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py diff --git a/pkgs/applications/networking/irc/thelounge/default.nix b/pkgs/applications/networking/irc/thelounge/default.nix index adb46e2bab7..eff1458e07e 100644 --- a/pkgs/applications/networking/irc/thelounge/default.nix +++ b/pkgs/applications/networking/irc/thelounge/default.nix @@ -88,5 +88,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ winter raitobezarius ]; license = licenses.mit; inherit (nodejs.meta) platforms; + mainProgram = "thelounge"; }; }) |