From 1c12d6decfcbd386ddd574d72a70b788977ec4fd Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 8 Oct 2022 08:32:39 +0100 Subject: [PATCH] catclock: use xorg.* packages directly instead of xlibsWrapper indirection Validated by `diffoscope`: `out` output differs only by RUNPATH libraries order. --- pkgs/applications/misc/catclock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix index 494ed3001e5c1..e65bcd2ff2e2d 100644 --- a/pkgs/applications/misc/catclock/default.nix +++ b/pkgs/applications/misc/catclock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, xlibsWrapper, motif +{ stdenv, lib, fetchFromGitHub, motif, xorg , withAudioTracking ? false, libpulseaudio, aubio }: stdenv.mkDerivation { @@ -21,7 +21,7 @@ stdenv.mkDerivation { makeFlags = [ "DESTINATION=$(out)/bin/" ] ++ lib.optional withAudioTracking "WITH_TEMPO_TRACKER=1"; - buildInputs = [ xlibsWrapper motif ] + buildInputs = [ motif xorg.libX11 xorg.libXext xorg.libXt ] ++ lib.optionals withAudioTracking [ libpulseaudio aubio ]; meta = with lib; {