From 3efeae33bb875c9cf7241480bcd90f20cbe574d0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 26 Apr 2019 16:11:03 -0500 Subject: [PATCH 1/2] xlayoutdisplay: 1.0.2 -> 1.1.0 https://github.com/alex-courtis/xlayoutdisplay/releases/tag/v1.1.0 --- pkgs/tools/X11/xlayoutdisplay/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/xlayoutdisplay/default.nix b/pkgs/tools/X11/xlayoutdisplay/default.nix index 5983cd3e663a..c8cef8d5cb3d 100644 --- a/pkgs/tools/X11/xlayoutdisplay/default.nix +++ b/pkgs/tools/X11/xlayoutdisplay/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, xorg, boost, cmake, gtest }: stdenv.mkDerivation rec { - name = "xlayoutdisplay-${version}"; - version = "1.0.2"; + pname = "xlayoutdisplay"; + version = "1.1.0"; src = fetchFromGitHub { owner = "alex-courtis"; - repo = "xlayoutdisplay"; + repo = pname; rev = "v${version}"; - sha256 = "1cqn98lpx9rkfhavbqalaaljw351hvqsrszgqnwvcyq05vq26dwx"; + sha256 = "0wm6a48ym0wn2w0872mfq40ghajfrg1bccj1g342w899qh5x3bc4"; }; nativeBuildInputs = [ cmake ]; @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { --replace 'fprintf(lidStateFile, contents);' \ 'fputs(contents, lidStateFile);' + substituteInPlace CMakeLists.txt --replace "set(Boost_USE_STATIC_LIBS ON)" "" ''; meta = with stdenv.lib; { From 313b1def6a6e300b02fec79710feb517fe4da40b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 27 Apr 2019 19:46:54 -0500 Subject: [PATCH 2/2] xlayoutdisplay: limit to linux --- pkgs/tools/X11/xlayoutdisplay/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/X11/xlayoutdisplay/default.nix b/pkgs/tools/X11/xlayoutdisplay/default.nix index c8cef8d5cb3d..30903e448563 100644 --- a/pkgs/tools/X11/xlayoutdisplay/default.nix +++ b/pkgs/tools/X11/xlayoutdisplay/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/alex-courtis/xlayoutdisplay; maintainers = with maintainers; [ dtzWill ]; license = licenses.asl20; + platforms = platforms.linux; }; }