Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 43f9d5ccaa95
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a089b030d7e2
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 28, 2019

  1. xlayoutdisplay: 1.0.2 -> 1.1.0 

    https://github.com/alex-courtis/xlayoutdisplay/releases/tag/v1.1.0
    @dtzWill
    dtzWill committed Apr 28, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3efeae3 View commit details

  2. xlayoutdisplay: limit to linux

    @dtzWill
    dtzWill committed Apr 28, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    313b1de View commit details

  3. Merge pull request #60294 from dtzWill/update/xlayoutdisplay-1.1.0 

    xlayoutdisplay: 1.0.2 -> 1.1.0
    @teto
    teto authored Apr 28, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a089b03 View commit details
Showing with 6 additions and 4 deletions.
  1. +6 −4 pkgs/tools/X11/xlayoutdisplay/default.nix
10 changes: 6 additions & 4 deletions pkgs/tools/X11/xlayoutdisplay/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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,12 +23,14 @@ stdenv.mkDerivation rec {
--replace 'fprintf(lidStateFile, contents);' \
'fputs(contents, lidStateFile);'
substituteInPlace CMakeLists.txt --replace "set(Boost_USE_STATIC_LIBS ON)" ""
'';

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;
platforms = platforms.linux;
};
}