ncpamixer: 1.3.3.3 -> 1.3.7

This commit is contained in:
paumr 2023-10-28 20:23:03 +02:00 committed by Bjørn Forsman
parent 53a48365bf
commit 2207adf4f7
2 changed files with 34 additions and 4 deletions

View File

@ -1,17 +1,31 @@
{ lib, stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkg-config }:
{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, ncurses, libpulseaudio, pandoc, pkg-config }:
stdenv.mkDerivation rec {
pname = "ncpamixer";
version = "1.3.3.5";
version = "1.3.7";
src = fetchFromGitHub {
owner = "fulhax";
repo = "ncpamixer";
rev = version;
sha256 = "sha256-iwwfuMZn8HwnTIEBgTuvnJNlRlPt4G+j/piXO8S7mPc=";
sha256 = "sha256-GJ2zSIxSnL53nFZ2aeGlVI7i4APt+aALVEhNP5RkpMc=";
};
nativeBuildInputs = [ cmake pkg-config ];
patches = [
./remove_dynamic_download.patch
];
postPatch = let
PandocMan = fetchurl {
url = "https://github.com/rnpgp/cmake-modules/raw/387084811ee01a69911fe86bcc644b7ed8ad6304/PandocMan.cmake";
hash = "sha256-KI55Yc2IuQtmbptqkk6Hzr75gIE/uQdUbQsm/fDpaWg=";
};
in ''
substituteInPlace src/CMakeLists.txt \
--replace "include(PandocMan)" "include(${PandocMan})"
'';
nativeBuildInputs = [ cmake pandoc pkg-config ];
buildInputs = [ ncurses libpulseaudio ];

View File

@ -0,0 +1,16 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8aac546..ec809e8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,11 +14,9 @@ if(USE_WIDE)
set(CURSES_NEED_WIDE TRUE)
endif()
-include(FetchContent)
include(GNUInstallDirs)
if (BUILD_MANPAGES)
- include("${CMAKE_CURRENT_SOURCE_DIR}/cmake.deps/FetchPandocMan.cmake")
include(PandocMan)
add_pandoc_man("${CMAKE_CURRENT_SOURCE_DIR}/man/ncpamixer.1.md")
endif()