dart.rhttp: add 0.9.6

aucub 020aaf62 f0a890df

+12 -11
+4 -4
pkgs/development/compilers/dart/package-source-builders/rhttp/cargokit.patch
··· 70 # If we have actual cmake target provided create target and make existing 71 # target depend on it 72 - add_custom_target("${target}_cargokit" DEPENDS ${OUTPUT_LIB}) 73 - + add_custom_target("${target}_cargokit" DEPENDS OUTPUT_LIB) 74 add_dependencies("${target}" "${target}_cargokit") 75 - target_link_libraries("${target}" PRIVATE "${OUTPUT_LIB}${IMPORT_LIB_EXTENSION}") 76 - + target_link_libraries("${target}" PRIVATE OUTPUT_LIB) 77 if(WIN32) 78 target_link_options(${target} PRIVATE "/INCLUDE:${any_symbol_name}") 79 endif() 80 else() 81 # Otherwise (FFI) just use ALL to force building always 82 - add_custom_target("${target}_cargokit" ALL DEPENDS ${OUTPUT_LIB}) 83 - + add_custom_target("${target}_cargokit" ALL DEPENDS OUTPUT_LIB) 84 endif() 85 86 # Allow adding the output library to plugin bundled libraries 87 - set("${target}_cargokit_lib" ${OUTPUT_LIB} PARENT_SCOPE) 88 - + set("${target}_cargokit_lib" OUTPUT_LIB PARENT_SCOPE) 89 90 endfunction()
··· 70 # If we have actual cmake target provided create target and make existing 71 # target depend on it 72 - add_custom_target("${target}_cargokit" DEPENDS ${OUTPUT_LIB}) 73 + + add_custom_target("${target}_cargokit" DEPENDS @output_lib@) 74 add_dependencies("${target}" "${target}_cargokit") 75 - target_link_libraries("${target}" PRIVATE "${OUTPUT_LIB}${IMPORT_LIB_EXTENSION}") 76 + + target_link_libraries("${target}" PRIVATE @output_lib@) 77 if(WIN32) 78 target_link_options(${target} PRIVATE "/INCLUDE:${any_symbol_name}") 79 endif() 80 else() 81 # Otherwise (FFI) just use ALL to force building always 82 - add_custom_target("${target}_cargokit" ALL DEPENDS ${OUTPUT_LIB}) 83 + + add_custom_target("${target}_cargokit" ALL DEPENDS @output_lib@) 84 endif() 85 86 # Allow adding the output library to plugin bundled libraries 87 - set("${target}_cargokit_lib" ${OUTPUT_LIB} PARENT_SCOPE) 88 + + set("${target}_cargokit_lib" @output_lib@ PARENT_SCOPE) 89 90 endfunction()
+8 -7
pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix
··· 2 lib, 3 rustPlatform, 4 stdenv, 5 }: 6 7 { version, src, ... }: ··· 16 cargoHash = 17 { 18 _0_9_1 = "sha256-Gl3ArdSuw3/yi/JX6oloKJqerSJjTfK8HXRNei/LO+4="; 19 } 20 .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw '' 21 Unsupported version of pub 'rhttp': '${version}' ··· 34 inherit version src; 35 inherit (src) passthru; 36 37 - patches = [ ./cargokit.patch ]; 38 - 39 - postPatch = '' 40 - substituteInPlace ./cargokit/cmake/cargokit.cmake --replace-fail "OUTPUT_LIB" "${rustDep}/${rustDep.passthru.libraryPath}" 41 - ''; 42 43 installPhase = '' 44 runHook preInstall 45 46 - mkdir $out/ 47 - cp -r ./* $out/ 48 49 runHook postInstall 50 '';
··· 2 lib, 3 rustPlatform, 4 stdenv, 5 + replaceVars, 6 }: 7 8 { version, src, ... }: ··· 17 cargoHash = 18 { 19 _0_9_1 = "sha256-Gl3ArdSuw3/yi/JX6oloKJqerSJjTfK8HXRNei/LO+4="; 20 + _0_9_6 = "sha256-a11UxG8nbIng+6uOWq/BZxdtRmRINl/7UOc6ap2mgrk="; 21 } 22 .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw '' 23 Unsupported version of pub 'rhttp': '${version}' ··· 36 inherit version src; 37 inherit (src) passthru; 38 39 + patches = [ 40 + (replaceVars ./cargokit.patch { 41 + output_lib = "${rustDep}/${rustDep.passthru.libraryPath}"; 42 + }) 43 + ]; 44 45 installPhase = '' 46 runHook preInstall 47 48 + cp -r . $out 49 50 runHook postInstall 51 '';