httplib: 0.17.3 -> 0.18.0 (#343963) (7686035a) · Commits · mdf / nixpkgs

pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix

+12 −6

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@
		alsa-lib,
		asio,
		curl,
		libremidi,
		nlohmann_json,
		obs-studio,
		opencv,
		@@ -16,12 +17,17 @@
		stdenv,
		tesseract,
		websocketpp,
		xorg,

		httplib,
		libremidi,
		libXScrnSaver,
		}:

		let
		httplib-src = fetchFromGitHub {
		owner = "yhirose";
		repo = "cpp-httplib";
		rev = "v0.17.3";
		hash = "sha256-yvaPIbRqJGkiob3Nrv3H1ieFAC5b+h1tTncJWTy4dmk=";
		};
		in
		stdenv.mkDerivation rec {
		pname = "advanced-scene-switcher";
		version = "1.27.2";
		@@ -50,13 +56,13 @@ stdenv.mkDerivation rec {
		qtbase
		tesseract
		websocketpp
		xorg.libXScrnSaver
		libXScrnSaver
		];

		dontWrapQtApps = true;

		postUnpack = ''
		cp -r ${httplib.src}/* $sourceRoot/deps/cpp-httplib
		cp -r ${httplib-src}/* $sourceRoot/deps/cpp-httplib
		cp -r ${libremidi.src}/* $sourceRoot/deps/libremidi
		chmod -R +w $sourceRoot/deps/cpp-httplib
		chmod -R +w $sourceRoot/deps/libremidi

+36 −0

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchFromGitHub
		, cmake
		, openssl
		{
		lib,
		cmake,
		fetchFromGitHub,
		openssl,
		stdenv,
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "httplib";
		version = "0.17.3";
		version = "0.18.0";

		src = fetchFromGitHub {
		owner = "yhirose";
		repo = "cpp-httplib";
		rev = "v${version}";
		hash = "sha256-yvaPIbRqJGkiob3Nrv3H1ieFAC5b+h1tTncJWTy4dmk=";
		rev = "v${finalAttrs.version}";
		hash = "sha256-cR1yRqZ6hZeGtMhiW003zcN0d/f/v1gMMNiL0hA1r6I=";
		};

		nativeBuildInputs = [ cmake ];

		buildInputs = [ openssl ];

		meta = with lib; {
		description = "C++ header-only HTTP/HTTPS server and client library";
		strictDeps = true;

		meta = {
		homepage = "https://github.com/yhirose/cpp-httplib";
		changelog = "https://github.com/yhirose/cpp-httplib/releases/tag/v${version}";
		maintainers = with maintainers; [ aidalgol ];
		license = licenses.mit;
		platforms = platforms.all;
		description = "C++ header-only HTTP/HTTPS server and client library";
		changelog = "https://github.com/yhirose/cpp-httplib/releases/tag/${finalAttrs.src.rev}";
		license = lib.licenses.mit;
		maintainers = with lib.maintainers; [
		AndersonTorres
		];
		platforms = lib.platforms.all;
		};
		}
		})

+35 −21

Original line number	Diff line number	Diff line
		{ alsa-lib
		, cmake
		, CoreAudio
		, CoreFoundation
		, CoreMIDI
		, CoreServices
		, fetchFromGitHub
		, lib
		, stdenv
		{
		lib,
		alsa-lib,
		cmake,
		darwin,
		fetchFromGitHub,
		stdenv,
		}:

		stdenv.mkDerivation rec {
		let
		inherit (darwin.apple_sdk.frameworks)
		CoreAudio
		CoreFoundation
		CoreMIDI
		CoreServices
		;
		in
		stdenv.mkDerivation (finalAttrs: {
		pname = "libremidi";
		version = "4.4.0";

		src = fetchFromGitHub {
		owner = "jcelerier";
		repo = "libremidi";
		rev = "v${version}";
		rev = "v${finalAttrs.version}";
		hash = "sha256-raVBJ75/UmM3P69s8VNUXRE/2jV4WqPIfI4eXaf6UEg=";
		};

		nativeBuildInputs = [ cmake ];
		nativeBuildInputs = [
		cmake
		];

		buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib
		buildInputs =
		lib.optionals stdenv.hostPlatform.isLinux [
		alsa-lib
		]
		++ lib.optionals stdenv.hostPlatform.isDarwin [
		CoreAudio
		CoreFoundation
		@@ -30,15 +41,18 @@ stdenv.mkDerivation rec {
		CoreServices
		];

		# Bug: set this as true breaks obs-studio-plugins.advanced-scene-switcher
		strictDeps = false;

		postInstall = ''
		cp -r $src/include $out
		'';

		meta = {
		description = "Modern C++ MIDI real-time & file I/O library";
		homepage = "https://github.com/jcelerier/libremidi";
		maintainers = [ ];
		description = "Modern C++ MIDI real-time & file I/O library";
		license = lib.licenses.bsd2;
		maintainers = with lib.maintainers; [ AndersonTorres ];
		platforms = lib.platforms.all;
		};
		}
		})

+0 −10

Original line number	Diff line number	Diff line
		@@ -19780,8 +19780,6 @@ with pkgs;

		hnswlib = callPackage ../development/libraries/hnswlib { };

		httplib = callPackage ../development/libraries/httplib { };

		icon-lang = callPackage ../development/interpreters/icon-lang { };

		libgit2 = callPackage ../development/libraries/libgit2 {
		@@ -21248,14 +21246,6 @@ with pkgs;

		librem = callPackage ../development/libraries/librem { };

		libremidi = callPackage ../development/libraries/libremidi {
		inherit (darwin.apple_sdk.frameworks)
		CoreAudio
		CoreFoundation
		CoreMIDI
		CoreServices;
		};

		libremines = qt6.callPackage ../games/libremines { };

		librelp = callPackage ../development/libraries/librelp { };