From 18fd76f7c77742268ce1840c237a901df3a75c0e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 4 Oct 2021 13:19:08 -0300 Subject: [PATCH 1/2] pamixer: install using Makefile --- pkgs/applications/audio/pamixer/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index 4ea432885f60..5febf5f3dfcb 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, boost, libpulseaudio }: stdenv.mkDerivation rec { pname = "pamixer"; @@ -13,19 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost libpulseaudio ]; - nativeBuildInputs = [ installShellFiles ]; - - installPhase = '' - runHook preInstall - - install -Dm755 pamixer -t $out/bin - - runHook postInstall - ''; - - postInstall = '' - installManPage pamixer.1 - ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "Pulseaudio command line mixer"; From c8352c076d58731627feb972343601c6c646d9d7 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 4 Oct 2021 13:11:53 -0300 Subject: [PATCH 2/2] pamixer: unstable-2021-03-29 -> 1.5 --- pkgs/applications/audio/pamixer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index 5febf5f3dfcb..ac3df5c5f958 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pamixer"; - version = "unstable-2021-03-29"; + version = "1.5"; src = fetchFromGitHub { owner = "cdemoulins"; repo = "pamixer"; - rev = "4ea2594cb8c605dccd00a381ba19680eba368e94"; - sha256 = "sha256-kV4wIxm1WZvqqyfmgQ2cSbRJwJR154OW0MMDg2ntf6g="; + rev = version; + sha256 = "sha256-7VNhHAQ1CecQPlqb8SMKK0U1SsFZxDuS+QkPqJfMqrQ="; }; buildInputs = [ boost libpulseaudio ];