about summary refs log tree commit diff
path: root/pkgs/development/libraries/ustream-ssl/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/ustream-ssl/default.nix')
-rw-r--r--pkgs/development/libraries/ustream-ssl/default.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/libraries/ustream-ssl/default.nix b/pkgs/development/libraries/ustream-ssl/default.nix
index 27b40d0a7ce5..007ebc9c4573 100644
--- a/pkgs/development/libraries/ustream-ssl/default.nix
+++ b/pkgs/development/libraries/ustream-ssl/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, fetchgit, cmake, pkg-config, libubox, ssl_implementation }:
+{ stdenv, lib, fetchgit, cmake, pkg-config, libubox-nossl, ssl_implementation }:
 
 stdenv.mkDerivation {
   pname = "ustream-ssl";
-  version = "unstable-2022-12-08";
+  version = "unstable-2022-12-08-${ssl_implementation.pname}";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/ustream-ssl.git";
@@ -12,8 +12,8 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     sed -r \
-        -e "s|ubox_include_dir libubox/ustream.h|ubox_include_dir libubox/ustream.h HINTS ${libubox}/include|g" \
-        -e "s|ubox_library NAMES ubox|ubox_library NAMES ubox HINTS ${libubox}/lib|g" \
+        -e "s|ubox_include_dir libubox/ustream.h|ubox_include_dir libubox/ustream.h HINTS ${libubox-nossl}/include|g" \
+        -e "s|ubox_library NAMES ubox|ubox_library NAMES ubox HINTS ${libubox-nossl}/lib|g" \
         -e "s|^  FIND_LIBRARY\((.+)\)|  FIND_LIBRARY\(\1 HINTS ${if ssl_implementation ? lib then ssl_implementation.lib else ssl_implementation.out}\)|g" \
         -i CMakeLists.txt
   '';
@@ -23,6 +23,10 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ ssl_implementation ];
 
+  passthru = {
+    inherit ssl_implementation;
+  };
+
   meta = with lib; {
     description = "ustream SSL wrapper";
     homepage = "https://git.openwrt.org/?p=project/ustream-ssl.git;a=summary";