From c24886ed8a31263c9580f2e2c3559ffce69fb9e0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 9 Oct 2024 17:37:44 +0200
Subject: [PATCH 1/2] mediamtx: move to by-name

---
 .../mediamtx/default.nix => by-name/me/mediamtx/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{servers/mediamtx/default.nix => by-name/me/mediamtx/package.nix} (100%)

diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/by-name/me/mediamtx/package.nix
similarity index 100%
rename from pkgs/servers/mediamtx/default.nix
rename to pkgs/by-name/me/mediamtx/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bf494982ab4..d860f366bdf2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26381,8 +26381,6 @@ with pkgs;
 
   rojo = callPackage ../development/tools/rojo { };
 
-  mediamtx = callPackage ../servers/mediamtx { };
-
   rtkit = callPackage ../os-specific/linux/rtkit { };
 
   rt-tests = callPackage ../os-specific/linux/rt-tests { };

From 646197d7db0e95a21a0172cd897748adefd61a46 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 9 Oct 2024 17:44:51 +0200
Subject: [PATCH 2/2] mediamtx: 1.9.1 -> 1.9.2

---
 pkgs/by-name/me/mediamtx/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix
index 58c3bab2b160..b0cc36acefcd 100644
--- a/pkgs/by-name/me/mediamtx/package.nix
+++ b/pkgs/by-name/me/mediamtx/package.nix
@@ -15,26 +15,27 @@ in
 buildGoModule rec {
   pname = "mediamtx";
   # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "bluenviron";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-DCt0P0DHlWFAQ5i4+7U5+Q2XcCPlSZrlj+Ljcyg/Wj0=";
+    hash = "sha256-aHVSGyrLuLX/RYf1I1dDackmOeU3m24QcwBus4Uly0I=";
   };
 
-  vendorHash = "sha256-YKNNQPEdO8K7Lpm/S86GKD3QcNcyvwZSrBspZJMJ78Y=";
+  vendorHash = "sha256-YpwbFCfI2kfmX3nI1G9OGUv5qpZ/JMis5VyUkqsESZA=";
 
   postPatch = ''
     cp ${hlsJs} internal/servers/hls/hls.min.js
+    echo "v${version}" > internal/core/VERSION
   '';
 
+  subPackages = [ "." ];
+
   # Tests need docker
   doCheck = false;
 
-  ldflags = [ "-X github.com/bluenviron/mediamtx/internal/core.version=v${version}" ];
-
   passthru.tests = {
     inherit (nixosTests) mediamtx;
   };