diff options
author | Will Dietz <w@wdtz.org> | 2022-02-19 04:11:55 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-19 11:11:55 +0100 |
commit | 2f009472e5382b22135af7a3eb904e2cd26a52dc (patch) | |
tree | 1096a3882935243201bed8ed046a63900280d300 /pkgs/tools/X11/xlayoutdisplay | |
parent | 91c340ea11f2372ef1a02551ef38c31176b000b8 (diff) |
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>
Diffstat (limited to 'pkgs/tools/X11/xlayoutdisplay')
-rw-r--r-- | pkgs/tools/X11/xlayoutdisplay/default.nix | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/tools/X11/xlayoutdisplay/default.nix b/pkgs/tools/X11/xlayoutdisplay/default.nix index 16565296e1e66..590d71b8f4a3f 100644 --- a/pkgs/tools/X11/xlayoutdisplay/default.nix +++ b/pkgs/tools/X11/xlayoutdisplay/default.nix @@ -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"; |