christian
/
nixpkgs-overlay
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

use picotls.src from picotls package; remove unneeded escaping

This commit is contained in:
Christian Ulrich 2020-10-29 17:50:21 +01:00
parent e86c37422b
commit 63e81bf7d9
No known key found for this signature in database
GPG Key ID: 8241BE099775A097
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/quicly/default.nix
View File

@ -2,17 +2,11 @@
, cmake , cmake
, openssl , openssl
, perl , perl
, picotls
, fetchFromGitHub , fetchFromGitHub
}: }:
let let
picotls = fetchFromGitHub {
owner = "h2o";
repo = "picotls";
rev = "9238121fa7788e8642072b6d4d1a2f2fb71db242";
sha256 = "0yam62yd606q8v515r74l110gmch4i4bif9hfxn7mgvcdv979l7d";
};
picotest = fetchFromGitHub { picotest = fetchFromGitHub {
owner = "h2o"; owner = "h2o";
repo = "picotest"; repo = "picotest";
@ -50,11 +44,11 @@ stdenv.mkDerivation rec {
]; ];
patchPhase = '' patchPhase = ''
sed -i 's|''${CMAKE_SOURCE_DIR}/deps/picotls|${picotls}|g' CMakeLists.txt sed -i 's|''${CMAKE_SOURCE_DIR}/deps/picotls|${picotls.src}|g' CMakeLists.txt
sed -i 's|deps/klib|${klib}|g' CMakeLists.txt sed -i 's|deps/klib|${klib}|g' CMakeLists.txt
sed -i 's|deps/picotls|${picotls}|g' CMakeLists.txt sed -i 's|deps/picotls|${picotls.src}|g' CMakeLists.txt
sed -i 's|deps/picotest|${picotest}|g' CMakeLists.txt sed -i 's|deps/picotest|${picotest}|g' CMakeLists.txt
sed -i 's|\.\./deps/picotls|${picotls}|g' src/cli.c sed -i 's|../deps/picotls|${picotls.src}|g' src/cli.c
''; '';
installPhase = '' installPhase = ''