diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index 68d48e71d1c7..9037ccd0ac67 100644 --- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -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 diff --git a/pkgs/by-name/ht/httplib/package.nix b/pkgs/by-name/ht/httplib/package.nix new file mode 100644 index 000000000000..7b5c7b0f68e2 --- /dev/null +++ b/pkgs/by-name/ht/httplib/package.nix @@ -0,0 +1,36 @@ +{ + lib, + cmake, + fetchFromGitHub, + openssl, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "httplib"; + version = "0.18.0"; + + src = fetchFromGitHub { + owner = "yhirose"; + repo = "cpp-httplib"; + rev = "v${finalAttrs.version}"; + hash = "sha256-cR1yRqZ6hZeGtMhiW003zcN0d/f/v1gMMNiL0hA1r6I="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ openssl ]; + + strictDeps = true; + + meta = { + homepage = "https://github.com/yhirose/cpp-httplib"; + 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; + }; +}) diff --git a/pkgs/development/libraries/libremidi/default.nix b/pkgs/by-name/li/libremidi/package.nix similarity index 51% rename from pkgs/development/libraries/libremidi/default.nix rename to pkgs/by-name/li/libremidi/package.nix index 6717b97203b7..0395afa80c0e 100644 --- a/pkgs/development/libraries/libremidi/default.nix +++ b/pkgs/by-name/li/libremidi/package.nix @@ -1,44 +1,58 @@ -{ 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 ]; - - buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreAudio - CoreFoundation - CoreMIDI - CoreServices + nativeBuildInputs = [ + cmake ]; + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + CoreAudio + CoreFoundation + CoreMIDI + 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; }; -} +}) diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix deleted file mode 100644 index eb733b4df17b..000000000000 --- a/pkgs/development/libraries/httplib/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, openssl -}: - -stdenv.mkDerivation rec { - pname = "httplib"; - version = "0.17.3"; - - src = fetchFromGitHub { - owner = "yhirose"; - repo = "cpp-httplib"; - rev = "v${version}"; - hash = "sha256-yvaPIbRqJGkiob3Nrv3H1ieFAC5b+h1tTncJWTy4dmk="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl ]; - - meta = with lib; { - description = "C++ header-only HTTP/HTTPS server and client library"; - 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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ecb984fb667..83304041dc66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };