cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #270568 from wineee/xlayoutdisplay

Browse source 
xlayoutdisplay: 1.3.0 -> 1.5.0
This commit is contained in:
Weijia Wang 2023-11-30 01:23:58 +01:00 committed by GitHub
commit ef13e20509
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/X11/xlayoutdisplay/default.nix
View file

@ -1,27 +1,23 @@
{ lib, stdenv, fetchFromGitHub, xorg, boost, gtest }: { lib, stdenv, fetchFromGitHub, pkg-config, xorg, boost, gtest }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xlayoutdisplay"; pname = "xlayoutdisplay";
version = "1.3.0"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alex-courtis"; owner = "alex-courtis";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-8K9SoZToJTk/sL4PC4Fcsu9XzGLYfNIZlbIyxc9jf84="; hash = "sha256-A37jFhVTW/3QNEf776Oi3ViRK+ebOPRTsEQqdmNhA7E=";
}; };
nativeBuildInputs = [ pkg-config ];
buildInputs = with xorg; [ libX11 libXrandr libXcursor boost ]; buildInputs = with xorg; [ libX11 libXrandr libXcursor boost ];
nativeCheckInputs = [ gtest ]; nativeCheckInputs = [ gtest ];
doCheck = true; doCheck = true;
checkTarget = "gtest"; 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"}" ]; makeFlags = [ "PREFIX=${placeholder "out"}" ];
enableParallelBuilding = true; enableParallelBuilding = true;