diff --git a/pkgs/by-name/in/influxdb-cxx/package.nix b/pkgs/by-name/in/influxdb-cxx/package.nix index a5fb9cef6777..1869990db5e6 100644 --- a/pkgs/by-name/in/influxdb-cxx/package.nix +++ b/pkgs/by-name/in/influxdb-cxx/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, catch2_3, libcpr, trompeloeil }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, catch2_3, libcpr_1_10_5, trompeloeil }: stdenv.mkDerivation (finalAttrs: { pname = "influxdb-cxx"; @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost libcpr ] + buildInputs = [ boost libcpr_1_10_5 ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ catch2_3 trompeloeil ]; cmakeFlags = [ diff --git a/pkgs/by-name/li/libcpr/package.nix b/pkgs/by-name/li/libcpr/package.nix new file mode 100644 index 000000000000..abbf0dcb6e6e --- /dev/null +++ b/pkgs/by-name/li/libcpr/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, + staticOnly ? stdenv.hostPlatform.isStatic, +}: + +let + version = "1.11.0"; +in +stdenv.mkDerivation { + pname = "libcpr"; + inherit version; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "libcpr"; + repo = "cpr"; + rev = version; + hash = "sha256-jWyss0krj8MVFqU1LAig+4UbXO5pdcWIT+hCs9DxemM="; + }; + + nativeBuildInputs = [ cmake ]; + + propagatedBuildInputs = [ curl ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if staticOnly then "OFF" else "ON"}" + "-DCPR_USE_SYSTEM_CURL=ON" + ]; + + postPatch = '' + # Linking with stdc++fs is no longer necessary. + sed -i '/stdc++fs/d' include/CMakeLists.txt + ''; + + postInstall = '' + substituteInPlace "$out/lib/cmake/cpr/cprTargets.cmake" \ + --replace "_IMPORT_PREFIX \"$out\"" \ + "_IMPORT_PREFIX \"$dev\"" + ''; + + meta = with lib; { + description = "C++ wrapper around libcurl"; + homepage = "https://docs.libcpr.org/"; + license = licenses.mit; + maintainers = with maintainers; [ rycee ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libcpr/default.nix b/pkgs/by-name/li/libcpr_1_10_5/package.nix similarity index 83% rename from pkgs/development/libraries/libcpr/default.nix rename to pkgs/by-name/li/libcpr_1_10_5/package.nix index 8a4025cf7097..2164dcce331a 100644 --- a/pkgs/development/libraries/libcpr/default.nix +++ b/pkgs/by-name/li/libcpr_1_10_5/package.nix @@ -1,11 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, +}: -let version = "1.10.5"; in +let + version = "1.10.5"; +in stdenv.mkDerivation { pname = "libcpr"; inherit version; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; src = fetchFromGitHub { owner = "libcpr"; @@ -18,9 +29,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ curl ]; - cmakeFlags = [ - "-DCPR_USE_SYSTEM_CURL=ON" - ]; + cmakeFlags = [ "-DCPR_USE_SYSTEM_CURL=ON" ]; postPatch = '' # Linking with stdc++fs is no longer necessary. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93aa314ef3d8..736cb135f8ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20672,8 +20672,6 @@ with pkgs; libcomps = callPackage ../tools/package-management/libcomps { python = python3; }; - libcpr = callPackage ../development/libraries/libcpr { }; - libcredis = callPackage ../development/libraries/libcredis { }; libctb = callPackage ../development/libraries/libctb { };