From f042edd94a74c9a4f3a8f4a8d4cc07c1fe5b71c2 Mon Sep 17 00:00:00 2001 From: materus Date: Wed, 22 Nov 2023 00:57:05 +0100 Subject: [PATCH] github: disable build for 23.05 --- .github/workflows/build.yml | 2 +- pkgs/apps/obs/default.nix | 2 +- pkgs/apps/obs/libdatachannel.nix | 60 -------------------------------- 3 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 pkgs/apps/obs/libdatachannel.nix diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f977e09..3a8903d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: nixPath: - nixpkgs=channel:nixos-unstable - nixpkgs=channel:nixpkgs-unstable - - nixpkgs=channel:nixos-23.05 + # - nixpkgs=channel:nixos-23.05 runs-on: ubuntu-latest steps: - name: Checkout repository diff --git a/pkgs/apps/obs/default.nix b/pkgs/apps/obs/default.nix index d243d2d..cddbddf 100644 --- a/pkgs/apps/obs/default.nix +++ b/pkgs/apps/obs/default.nix @@ -50,7 +50,7 @@ , decklinkSupport ? false , blackmagic-desktop-video ? null , libcef -, libdatachannel ? pkgs.callPackage ./libdatachannel.nix {} +, libdatachannel , pkgs , qrcodegencpp ? pkgs.callPackage ./qrcodegencpp.nix {} , onevpl ? pkgs.callPackage ./onevpl.nix {} diff --git a/pkgs/apps/obs/libdatachannel.nix b/pkgs/apps/obs/libdatachannel.nix deleted file mode 100644 index 4093d67..0000000 --- a/pkgs/apps/obs/libdatachannel.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, srcOnly -, cmake -, ninja -, pkg-config -, libnice -, openssl -, plog -, srtp -, usrsctp -}: - -stdenv.mkDerivation rec { - pname = "libdatachannel"; - version = "0.19.3"; - - src = fetchFromGitHub { - owner = "paullouisageneau"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Cx+AfoeLOcqlrEVNuvMPJaY6K7ufu07p9XdjNwtPYf0="; - }; - - outputs = [ "out" "dev" ]; - - strictDeps = true; - nativeBuildInputs = [ - cmake - ninja - pkg-config - ]; - buildInputs = [ - libnice - openssl - srtp - usrsctp - plog - ]; - - cmakeFlags = [ - "-DUSE_NICE=ON" - "-DPREFER_SYSTEM_LIB=ON" - "-DNO_EXAMPLES=ON" - ]; - - postFixup = '' - # Fix include path that will be incorrect due to the "dev" output - substituteInPlace "$dev/lib/cmake/LibDataChannel/LibDataChannelTargets.cmake" \ - --replace "\''${_IMPORT_PREFIX}/include" "$dev/include" - ''; - - meta = with lib; { - description = "C/C++ WebRTC network library featuring Data Channels, Media Transport, and WebSockets"; - homepage = "https://libdatachannel.org/"; - license = with licenses; [ mpl20 ]; - platforms = platforms.linux; - }; -}