From 834ad07c6cfec943dd80c10fe8fee9f85168b70e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 14 Oct 2025 11:16:35 +0200 Subject: [PATCH 1/4] pnmixer: fix build with CMake 4 And fix compatibility with https://cmake.org/cmake/help/v4.1/policy/CMP0065.html --- .../pn/pnmixer/fix-cmake-version.patch | 33 +++++++++++++++++++ pkgs/by-name/pn/pnmixer/package.nix | 5 +++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/by-name/pn/pnmixer/fix-cmake-version.patch diff --git a/pkgs/by-name/pn/pnmixer/fix-cmake-version.patch b/pkgs/by-name/pn/pnmixer/fix-cmake-version.patch new file mode 100644 index 000000000000..6b3b16291624 --- /dev/null +++ b/pkgs/by-name/pn/pnmixer/fix-cmake-version.patch @@ -0,0 +1,33 @@ +From 3a4a988f6c69abece44fe2c77eab5f0a9ae7bbd2 Mon Sep 17 00:00:00 2001 +From: Stefan Frijters +Date: Mon, 13 Oct 2025 10:53:14 +0200 +Subject: [PATCH] Update minimum CMake version + +And fix compatibility with https://cmake.org/cmake/help/v4.1/policy/CMP0065.html +--- + CMakeLists.txt | 2 +- + src/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 10192bf..1bb3e0c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.10) + project(PNMixer) + + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index eb04c2b..8630a21 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -56,6 +56,7 @@ target_link_libraries(pnmixer "${PNMixer_DEPS_LDFLAGS}") + target_link_libraries(pnmixer m) + target_compile_options(pnmixer PUBLIC "${PNMixer_DEPS_CFLAGS}") + target_compile_definitions(pnmixer PUBLIC -DHAVE_CONFIG_H) ++set_property(TARGET pnmixer PROPERTY ENABLE_EXPORTS 1) + + install(TARGETS pnmixer DESTINATION "${CMAKE_INSTALL_BINDIR}") + diff --git a/pkgs/by-name/pn/pnmixer/package.nix b/pkgs/by-name/pn/pnmixer/package.nix index 06204e425d25..fe9a05624a17 100644 --- a/pkgs/by-name/pn/pnmixer/package.nix +++ b/pkgs/by-name/pn/pnmixer/package.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { sha256 = "0416pa933ddf4b7ph9zxhk5jppkk7ppcq1aqph6xsrfnka4yb148"; }; + patches = [ + # https://github.com/nicklan/pnmixer/pull/197 + ./fix-cmake-version.patch + ]; + nativeBuildInputs = [ cmake pkg-config From f7c69f0d5f123477a956f60f85a0b1a956e06020 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 14 Oct 2025 11:16:44 +0200 Subject: [PATCH 2/4] pnmixer: use finalAttrs pattern --- pkgs/by-name/pn/pnmixer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pn/pnmixer/package.nix b/pkgs/by-name/pn/pnmixer/package.nix index fe9a05624a17..a8f50dc158bc 100644 --- a/pkgs/by-name/pn/pnmixer/package.nix +++ b/pkgs/by-name/pn/pnmixer/package.nix @@ -13,14 +13,14 @@ pcre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pnmixer"; version = "0.7.2"; src = fetchFromGitHub { owner = "nicklan"; repo = "pnmixer"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0416pa933ddf4b7ph9zxhk5jppkk7ppcq1aqph6xsrfnka4yb148"; }; From d44cf28a95922338ef59445fc82dc145e9bfd7dd Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 14 Oct 2025 11:16:52 +0200 Subject: [PATCH 3/4] pnmixer: remove 'with lib' --- pkgs/by-name/pn/pnmixer/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pn/pnmixer/package.nix b/pkgs/by-name/pn/pnmixer/package.nix index a8f50dc158bc..83299045eaf6 100644 --- a/pkgs/by-name/pn/pnmixer/package.nix +++ b/pkgs/by-name/pn/pnmixer/package.nix @@ -44,15 +44,15 @@ stdenv.mkDerivation (finalAttrs: { pcre ]; - meta = with lib; { + meta = { homepage = "https://github.com/nicklan/pnmixer"; description = "ALSA volume mixer for the system tray"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ campadrenalin romildo ]; mainProgram = "pnmixer"; }; -} +}) From ac4d61cf19151a702a4d223f2d375bfa9affd632 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 14 Oct 2025 11:17:14 +0200 Subject: [PATCH 4/4] pnmixer: use hash instead of sha256 and tag instead of rev in fetcher --- pkgs/by-name/pn/pnmixer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pn/pnmixer/package.nix b/pkgs/by-name/pn/pnmixer/package.nix index 83299045eaf6..e5ea31043a16 100644 --- a/pkgs/by-name/pn/pnmixer/package.nix +++ b/pkgs/by-name/pn/pnmixer/package.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "nicklan"; repo = "pnmixer"; - rev = "v${finalAttrs.version}"; - sha256 = "0416pa933ddf4b7ph9zxhk5jppkk7ppcq1aqph6xsrfnka4yb148"; + tag = "v${finalAttrs.version}"; + hash = "sha256-iITliZrWZd0NvFgFzO49c94ry4T9J3jPIq61MZK6JhA="; }; patches = [