ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-14 08:31:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge #314436: live555: 2024.05.05 → 2024.05.15

Browse Source
This commit is contained in:
nicoo 2024-05-28 12:47:12 +00:00 committed by GitHub
commit f772b7cb92
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/by-name/li/live555/package.nix
View File

@ -10,7 +10,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "live555";
version = "2024.05.05";
version = "2024.05.15";
src = fetchurl {
urls = [
@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
"https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz"
"mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz"
];
hash = "sha256-jGT1jg5pa4bwIcxUy7/svIhU2HCxx2TNMkWvBfN33nM=";
hash = "sha256-Mgkf5XiFBEEDTTx+YlV12wE4zpmPPqaUPv9KcEK38D0=";
};
patches = [
@ -38,11 +38,24 @@ stdenv.mkDerivation (finalAttrs: {
openssl
];
makeFlags = [
"PREFIX=${placeholder "out"}"
"C_COMPILER=$(CC)"
"CPLUSPLUS_COMPILER=$(CXX)"
"LIBRARY_LINK=$(AR) cr "
"LINK=$(CXX) -o "
];
# Since NIX_CFLAGS_COMPILE affects both C and C++ toolchains, we set CXXFLAGS
# directly
env.CXXFLAGS = "-std=c++20";
strictDeps = true;
# Since NIX_CFLAGS_COMPILE does not differentiate C and C++ toolchains, we
# set CXXFLAGS directly
env.CXXFLAGS = "-std=c++20";
enableParallelBuilding = true;
# required for whitespaces in makeFlags
__structuredAttrs = true;
postPatch = ''
substituteInPlace config.macosx-catalina \
@ -75,19 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
runHook postConfigure
'';
makeFlags = [
"PREFIX=${placeholder "out"}"
"C_COMPILER=$(CC)"
"CPLUSPLUS_COMPILER=$(CXX)"
"LIBRARY_LINK=$(AR) cr "
"LINK=$(CXX) -o "
];
# required for whitespaces in makeFlags
__structuredAttrs = true;
enableParallelBuilding = true;
passthru.tests = {
# Downstream dependency
inherit vlc;