diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:42:53 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:42:53 +0100 |
commit | 8ba516664bf367889b06b06e4122372f82f24feb (patch) | |
tree | 01b691a7e1ad4797843b4c93d8a9d74fd16311d7 /pkgs/tools/X11 | |
parent | d00ca4476cd91bae052e8ded4d94e124a353d091 (diff) | |
parent | 5effa4e0f98b317fe4607b1a6548811017c3325d (diff) | |
download | nixlib-8ba516664bf367889b06b06e4122372f82f24feb.tar nixlib-8ba516664bf367889b06b06e4122372f82f24feb.tar.gz nixlib-8ba516664bf367889b06b06e4122372f82f24feb.tar.bz2 nixlib-8ba516664bf367889b06b06e4122372f82f24feb.tar.lz nixlib-8ba516664bf367889b06b06e4122372f82f24feb.tar.xz nixlib-8ba516664bf367889b06b06e4122372f82f24feb.tar.zst nixlib-8ba516664bf367889b06b06e4122372f82f24feb.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r-- | pkgs/tools/X11/wpgtk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/X11/xlayoutdisplay/default.nix | 34 |
2 files changed, 36 insertions, 2 deletions
diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index cc7f213b88b6..59b0b4104cc0 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "5.8.6"; + version = "5.8.7"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = "${version}"; - sha256 = "1i29zdmgm8knp6mmz3nfl0dwn3vd2wcvf5vn0gg8sv2wjgk3i10y"; + sha256 = "1pwchmipswk5sld1l5p8mdiicb848glnh7r3s5x9qvijp5s57c5i"; }; buildInputs = [ diff --git a/pkgs/tools/X11/xlayoutdisplay/default.nix b/pkgs/tools/X11/xlayoutdisplay/default.nix new file mode 100644 index 000000000000..5983cd3e663a --- /dev/null +++ b/pkgs/tools/X11/xlayoutdisplay/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, xorg, boost, cmake, gtest }: + +stdenv.mkDerivation rec { + name = "xlayoutdisplay-${version}"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "alex-courtis"; + repo = "xlayoutdisplay"; + rev = "v${version}"; + sha256 = "1cqn98lpx9rkfhavbqalaaljw351hvqsrszgqnwvcyq05vq26dwx"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = with xorg; [ libX11 libXrandr libXcursor boost ]; + checkInputs = [ gtest ]; + + doCheck = true; + + # format security fixup + postPatch = '' + substituteInPlace test/test-Monitors.cpp \ + --replace 'fprintf(lidStateFile, contents);' \ + 'fputs(contents, lidStateFile);' + + ''; + + meta = with stdenv.lib; { + description = "Detects and arranges linux display outputs, using XRandR for detection and xrandr for arrangement"; + homepage = https://github.com/alex-courtis/xlayoutdisplay; + maintainers = with maintainers; [ dtzWill ]; + license = licenses.asl20; + }; +} |