From fb83fbd42eaa6c7400aa08e377d494f23c4cb717 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 31 Oct 2023 15:47:20 +0000 Subject: [PATCH 1/2] libdatachannel: fix include path in cmake files Previously it referred to $out/include which doesn't exist. --- pkgs/development/libraries/libdatachannel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/development/libraries/libdatachannel/default.nix index 4561f04ba06b..8f681e18cba6 100644 --- a/pkgs/development/libraries/libdatachannel/default.nix +++ b/pkgs/development/libraries/libdatachannel/default.nix @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { ]; postFixup = '' - # Fix shared library path that will be incorrect on move to "dev" output - substituteInPlace "$dev/lib/cmake/LibDataChannel/LibDataChannelTargets-release.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib" "$out/lib" + # 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; { From 235d8a1cab2cc828eb5e1eb5c9c0b3849e6d2c08 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 31 Oct 2023 15:51:40 +0000 Subject: [PATCH 2/2] libdatachannel: 0.19.2 -> 0.19.3 --- pkgs/development/libraries/libdatachannel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/development/libraries/libdatachannel/default.nix index 8f681e18cba6..5271663a10b8 100644 --- a/pkgs/development/libraries/libdatachannel/default.nix +++ b/pkgs/development/libraries/libdatachannel/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = pname; rev = "v${version}"; - hash = "sha256-x7/jgoaFVfx5j+CP8S/uIwkzjGskEqsY2Jxsd/Mj4VM="; + hash = "sha256-Cx+AfoeLOcqlrEVNuvMPJaY6K7ufu07p9XdjNwtPYf0="; }; outputs = [ "out" "dev" ];