From 16f27456c4b066955711d97241eba4fe1113c581 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 02:24:08 +0000 Subject: [PATCH 1/3] libcotp: 1.2.8 -> 2.0.0 --- pkgs/development/libraries/libcotp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix index 980b01549a25..48fe5adbf74f 100644 --- a/pkgs/development/libraries/libcotp/default.nix +++ b/pkgs/development/libraries/libcotp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcotp"; - version = "1.2.8"; + version = "2.0.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XWrLtWoYIEyGSwc1Qq1Q2NTn0USm1ekVyLWuwvppOZE="; + sha256 = "sha256-99Uw/BMk2bLj+/FZd7MwrRw62XcCroO9yNWdtH5AFpE="; }; buildInputs = [ libbaseencode libgcrypt ]; From 32bb0b6f36249705cf97deee668afcbc3250c336 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 14 Jan 2023 04:20:00 +0000 Subject: [PATCH 2/3] libcotp: fix build on darwin --- pkgs/development/libraries/libcotp/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix index 48fe5adbf74f..0644513e7927 100644 --- a/pkgs/development/libraries/libcotp/default.nix +++ b/pkgs/development/libraries/libcotp/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-99Uw/BMk2bLj+/FZd7MwrRw62XcCroO9yNWdtH5AFpE="; }; + postPatch = lib.optionalString stdenv.cc.isClang '' + substituteInPlace CMakeLists.txt \ + --replace "add_link_options(-Wl," "# add_link_options(-Wl," + ''; + buildInputs = [ libbaseencode libgcrypt ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -19,5 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/paolostivanin/libcotp"; license = licenses.asl20; maintainers = with maintainers; [ alexbakker ]; + platforms = platforms.all; }; } From 24ad2752002b829a68b5e50067d30a7f0a26d57d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 14 Jan 2023 04:20:00 +0000 Subject: [PATCH 3/3] libcotp: remove libbaseencode from buildInputs libcotp 2.0 deprecated libbaseencode --- pkgs/development/libraries/libcotp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix index 0644513e7927..4baa712b6803 100644 --- a/pkgs/development/libraries/libcotp/default.nix +++ b/pkgs/development/libraries/libcotp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libgcrypt, libbaseencode }: +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libgcrypt }: stdenv.mkDerivation rec { pname = "libcotp"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { --replace "add_link_options(-Wl," "# add_link_options(-Wl," ''; - buildInputs = [ libbaseencode libgcrypt ]; + buildInputs = [ libgcrypt ]; nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; {