From 817b64d991cd051d2cb0c89a2bacc381f8321f7e Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 28 Nov 2023 14:58:33 +0800 Subject: [PATCH] xlayoutdisplay: 1.3.0 -> 1.5.0 --- pkgs/tools/X11/xlayoutdisplay/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/X11/xlayoutdisplay/default.nix b/pkgs/tools/X11/xlayoutdisplay/default.nix index 499bd4694592..5ab9ca0b86ff 100644 --- a/pkgs/tools/X11/xlayoutdisplay/default.nix +++ b/pkgs/tools/X11/xlayoutdisplay/default.nix @@ -1,27 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, xorg, boost, gtest }: +{ lib, stdenv, fetchFromGitHub, pkg-config, xorg, boost, gtest }: stdenv.mkDerivation rec { pname = "xlayoutdisplay"; - version = "1.3.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "alex-courtis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8K9SoZToJTk/sL4PC4Fcsu9XzGLYfNIZlbIyxc9jf84="; + hash = "sha256-A37jFhVTW/3QNEf776Oi3ViRK+ebOPRTsEQqdmNhA7E="; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = with xorg; [ libX11 libXrandr libXcursor boost ]; nativeCheckInputs = [ gtest ]; doCheck = true; checkTarget = "gtest"; - # Fixup reference to hardcoded boost path, dynamically link as seems fine and we don't have static for this - postPatch = '' - substituteInPlace config.mk --replace '/usr/lib/libboost_program_options.a' '-lboost_program_options' - ''; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; enableParallelBuilding = true;