diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-30 15:52:19 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-30 15:52:19 +0200 |
| commit | 3462fe27d9232c6e7e3472dc7fcc4c1561f9166d (patch) | |
| tree | 5de7964838367fd02aef2b55ac7cb3e67ab7ddf9 /pkgs/tools/X11 | |
| parent | 84a15876a3a9f92b6ba53a7ac18a7fd96f405bf9 (diff) | |
| parent | 2e7c7dad92f4967c90c37a59894a301e2d073daf (diff) | |
| download | nixpkgs-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar nixpkgs-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar.gz nixpkgs-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar.bz2 nixpkgs-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar.lz nixpkgs-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar.xz nixpkgs-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar.zst nixpkgs-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/xlayoutdisplay/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/X11/xlayoutdisplay/default.nix b/pkgs/tools/X11/xlayoutdisplay/default.nix index 5983cd3e663..30903e44856 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; { @@ -30,5 +31,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/alex-courtis/xlayoutdisplay; maintainers = with maintainers; [ dtzWill ]; license = licenses.asl20; + platforms = platforms.linux; }; } |