diff options
| author | FliegendeWurst <2012gdwu+github@posteo.de> | 2022-01-19 22:19:05 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-01-26 11:11:23 +0000 |
| commit | 8bd7d610556ee07fca8c46546af32603748d25cd (patch) | |
| tree | 16117ee1a0c6c46da0a90e719811ddd61183c24b | |
| parent | Merge pull request #156674 from NixOS/backport-156553-to-release-21.11 (diff) | |
| download | nixpkgs-8bd7d610556ee07fca8c46546af32603748d25cd.tar.gz | |
live555: 2019.11.22 -> 2022.01.21
(cherry picked from commit 460fdfce74c739e774f8ac8e26447977cf63adad)
| -rw-r--r-- | pkgs/development/libraries/live555/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 081fa2f175bb..c180e2bc0b7e 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchurl, lib, darwin }: +{ stdenv, fetchurl, lib, darwin, openssl }: # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { pname = "live555"; - version = "2019.11.22"; + version = "2022.01.21"; src = fetchurl { # the upstream doesn't provide a stable URL urls = [ "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" ]; - sha256 = "144y2wsfpaclkj7srx85f3y3parzn7vbjmzc2afc62wdsb9gn46d"; + sha256 = "03m9wgw06vs93nbd55yq8qjpm92mcg9j7cih8j6blfnv8b0pj9bn"; }; postPatch = '' sed 's,/bin/rm,rm,g' -i genMakefiles + substituteInPlace config.macosx-catalina \ + --replace '/usr/lib/libssl.46.dylib' "${openssl.out}/lib/libssl.dylib" \ + --replace '/usr/lib/libcrypto.44.dylib' "${openssl.out}/lib/libcrypto.dylib" sed \ -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \ -i config.linux @@ -27,7 +30,7 @@ stdenv.mkDerivation rec { runHook preConfigure ./genMakefiles ${{ - x86_64-darwin = "macosx"; + x86_64-darwin = "macosx-catalina"; i686-linux = "linux"; x86_64-linux = "linux-64bit"; aarch64-linux = "linux-64bit"; @@ -50,6 +53,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; + buildInputs = [ openssl ]; + enableParallelBuilding = true; meta = with lib; { |