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: 0f00c2aee225
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 96185c31750a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 23, 2019

  1. xidlehook: 0.7.1 -> 0.8.0

    @d-goldin
    d-goldin committed Nov 23, 2019
    Copy the full SHA
    74cd007 View commit details

Commits on Nov 24, 2019

  1. Merge pull request #73962 from d-goldin/bump_xidlehook 

    xidlehook: 0.7.1 -> 0.8.0
    @Ma27
    Ma27 authored Nov 24, 2019
    Copy the full SHA
    96185c3 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/tools/X11/xidlehook/default.nix
10 changes: 5 additions & 5 deletions pkgs/tools/X11/xidlehook/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{ lib, stdenv, rustPlatform, fetchFromGitLab
{ lib, stdenv, rustPlatform, fetchFromGitLab, python3
, xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf, Security }:

rustPlatform.buildRustPackage rec {
pname = "xidlehook";
version = "0.7.1";
version = "0.8.0";

doCheck = false;

@@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec {
repo = "xidlehook";
rev = version;

sha256 = "04bb81iwxznkr1zq1q8dql9qklzm9qy7837a71b02ywp3fc6v5b2";
sha256 = "127b20y86xs2wq5ka236057nyrh87fgzhjqbl6azf002afnbsn5m";
};

cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"];
cargoSha256 = "0xnz2s8vh5njqs4a1qm98ydh8pywxvnnpym0z94fsifyfdjlsfm4";
cargoSha256 = "0jdkcxvlw7s8pz1ka3d2w97356a2axvlwfgyh2dz7nmfzpjx64x0";

buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security;
nativeBuildInputs = [ pkgconfig patchelf ];
nativeBuildInputs = [ pkgconfig patchelf python3 ];

postFixup = lib.optionalString stdenv.isLinux ''
RPATH="$(patchelf --print-rpath $out/bin/xidlehook)"