lol

xlayoutdisplay: 1.1.2 -> 1.3.0

* xlayoutdisplay: 1.1.2 -> 1.3.0 (#157579)

* no more cmake
* format string fixup was merged upstream, hooray
* continue to fixup boost linking, but altered for new build system

* xlayoutdisplay: check target is gtest

and build in parallel

Co-authored-by: Renaud <c0bw3b@users.noreply.github.com>

authored by

Will Dietz
Renaud
and committed by
GitHub
2f009472 91c340ea

+9 -10
+9 -10
pkgs/tools/X11/xlayoutdisplay/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, xorg, boost, cmake, gtest }: 1 + { lib, stdenv, fetchFromGitHub, xorg, boost, gtest }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "xlayoutdisplay"; 5 - version = "1.1.2"; 5 + version = "1.3.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "alex-courtis"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "0n3vg25gzwn1pcg6caxyyd1xf2w6n98m6jpxc70kqpxfqldxwl0m"; 11 + sha256 = "sha256-8K9SoZToJTk/sL4PC4Fcsu9XzGLYfNIZlbIyxc9jf84="; 12 12 }; 13 13 14 - nativeBuildInputs = [ cmake ]; 15 14 buildInputs = with xorg; [ libX11 libXrandr libXcursor boost ]; 16 15 checkInputs = [ gtest ]; 17 16 18 17 doCheck = true; 18 + checkTarget = "gtest"; 19 19 20 - # format security fixup 20 + # Fixup reference to hardcoded boost path, dynamically link as seems fine and we don't have static for this 21 21 postPatch = '' 22 - substituteInPlace test/test-Monitors.cpp \ 23 - --replace 'fprintf(lidStateFile, contents);' \ 24 - 'fputs(contents, lidStateFile);' 22 + substituteInPlace config.mk --replace '/usr/lib/libboost_program_options.a' '-lboost_program_options' 23 + ''; 25 24 26 - substituteInPlace CMakeLists.txt --replace "set(Boost_USE_STATIC_LIBS ON)" "" 27 - ''; 25 + makeFlags = [ "PREFIX=${placeholder "out"}" ]; 26 + enableParallelBuilding = true; 28 27 29 28 meta = with lib; { 30 29 description = "Detects and arranges linux display outputs, using XRandR for detection and xrandr for arrangement";