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>
This commit is contained in:
parent
91c340ea11
commit
2f009472e5
@ -1,31 +1,30 @@
|
||||
{ lib, stdenv, fetchFromGitHub, xorg, boost, cmake, gtest }:
|
||||
{ lib, stdenv, fetchFromGitHub, xorg, boost, gtest }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xlayoutdisplay";
|
||||
version = "1.1.2";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alex-courtis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0n3vg25gzwn1pcg6caxyyd1xf2w6n98m6jpxc70kqpxfqldxwl0m";
|
||||
sha256 = "sha256-8K9SoZToJTk/sL4PC4Fcsu9XzGLYfNIZlbIyxc9jf84=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = with xorg; [ libX11 libXrandr libXcursor boost ];
|
||||
checkInputs = [ gtest ];
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "gtest";
|
||||
|
||||
# format security fixup
|
||||
# Fixup reference to hardcoded boost path, dynamically link as seems fine and we don't have static for this
|
||||
postPatch = ''
|
||||
substituteInPlace test/test-Monitors.cpp \
|
||||
--replace 'fprintf(lidStateFile, contents);' \
|
||||
'fputs(contents, lidStateFile);'
|
||||
|
||||
substituteInPlace CMakeLists.txt --replace "set(Boost_USE_STATIC_LIBS ON)" ""
|
||||
substituteInPlace config.mk --replace '/usr/lib/libboost_program_options.a' '-lboost_program_options'
|
||||
'';
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Detects and arranges linux display outputs, using XRandR for detection and xrandr for arrangement";
|
||||
homepage = "https://github.com/alex-courtis/xlayoutdisplay";
|
||||
|
Loading…
Reference in New Issue
Block a user