From ff4cc43a860c36628630accef653a009c9d61f71 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sat, 22 Feb 2025 19:26:28 +0100 Subject: [PATCH] digiham: 0.6.0 -> 0.6.2, fix build --- pkgs/by-name/di/digiham/cpp-17.patch | 14 +++++++++++++ pkgs/by-name/di/digiham/package.nix | 30 ++++++++++++++++++---------- 2 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 pkgs/by-name/di/digiham/cpp-17.patch diff --git a/pkgs/by-name/di/digiham/cpp-17.patch b/pkgs/by-name/di/digiham/cpp-17.patch new file mode 100644 index 000000000000..98e210f0bcff --- /dev/null +++ b/pkgs/by-name/di/digiham/cpp-17.patch @@ -0,0 +1,14 @@ +Index: file.txt +=================================================================== +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,9 +7,8 @@ + project (digiham VERSION 0.6.2) + add_definitions(-DVERSION="${PROJECT_VERSION}") + + enable_language(CXX) +-set(CMAKE_CXX_STANDARD 11) + + include(GNUInstallDirs) + + find_package(CodecServer REQUIRED) diff --git a/pkgs/by-name/di/digiham/package.nix b/pkgs/by-name/di/digiham/package.nix index 78847bf00236..4d42b9bcdd9c 100644 --- a/pkgs/by-name/di/digiham/package.nix +++ b/pkgs/by-name/di/digiham/package.nix @@ -7,19 +7,25 @@ icu, csdr, codecserver, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "digiham"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "jketterl"; - repo = pname; - rev = version; - sha256 = "sha256-nKNA5xAhM/lyyvFJnajWwY0hwVZhLApbDkXoUYFjlt0="; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-v7qp6Lv94Ec0yzHsc08YDfE5OU54nglosRLWb98yDiQ="; }; + patches = [ + # libicu headers require C++ 17, remove `set(CMAKE_CXX_STANDARD 11)` + ./cpp-17.patch + ]; + nativeBuildInputs = [ cmake ]; @@ -31,11 +37,15 @@ stdenv.mkDerivation rec { icu ]; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${builtins.placeholder "out"}/bin/dmr_decoder"; + doInstallCheck = true; + + meta = { homepage = "https://github.com/jketterl/digiham"; description = "tools for decoding digital ham communication"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = teams.c3d2.members; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = lib.teams.c3d2.members; }; -} +})