Unverified Commit 0958e342 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 81f60ef9 f5c93dd4

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -18665,6 +18665,12 @@ 
    githubId = 82817;

    name = "Robert Kreuzer";

  };

  rksm = {

    email = "robert@kra.hn";

    github = "rksm";

    githubId = 467450;

    name = "Robert Krahn";

  };

  rlupton20 = {

    email = "richard.lupton@gmail.com";

    github = "rlupton20";

pkgs/applications/networking/browsers/netsurf/browser.nix

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ stdenv.mkDerivation (finalAttrs: { 


  env.CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE";



  env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";



  patchPhase = lib.optionalString stdenv.cc.isClang ''

    runHook prePatch

pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix

+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ stdenv.mkDerivation rec { 
    libnotify

    libdbusmenu

    pipewire

    stdenv.cc.cc

    xdg-utils

    wayland

  ];

pkgs/applications/video/obs-studio/plugins/obs-hyperion/check-state-changed.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/src/HyperionProperties.cpp b/src/HyperionProperties.cpp

index b585702..3fd308c 100644

--- a/src/HyperionProperties.cpp

+++ b/src/HyperionProperties.cpp

@@ -59,7 +59,7 @@ HyperionProperties::HyperionProperties(QWidget *parent)

 	signal_handler_connect(handler, "log", logger_message, this);

 

 	connect(ui->ButtonStart, &QPushButton::clicked, this, &HyperionProperties::saveSettings);

-	connect(ui->AutoStart, &QCheckBox::stateChanged, this, &HyperionProperties::saveSettings);

+	connect(ui->AutoStart, &QCheckBox::checkStateChanged, this, &HyperionProperties::saveSettings);

 

 	connect(ui->ButtonStart, &QPushButton::clicked, this, &HyperionProperties::onStart);

 	connect(ui->ButtonStop, &QPushButton::clicked, this, &HyperionProperties::onStop);

pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec { 


  dontWrapQtApps = true;



  patches = [ ./check-state-changed.patch ];



  cmakeFlags = [

    "-DOBS_SOURCE=${obs-studio.src}"

    "-DGLOBAL_INSTALLATION=ON"