From a2ae93adc9d964b77d4e647883324540e5deadcc Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Sun, 18 Nov 2018 08:23:44 +0100 Subject: [PATCH 1/2] xidlehook: 0.6.0 -> 0.6.1 --- pkgs/tools/X11/xidlehook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 5bdab3104a3..0cfd9e218ca 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; - version = "0.6.0"; + version = "0.6.1"; doCheck = false; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { repo = "xidlehook"; rev = version; - sha256 = "0rmc0g5cizyzwpk4yyh7bda70x9ybaivc6iw441k6abxmzbh358g"; + sha256 = "04h6j66wif202x4kssagb66nnrz9m9ccs1d0dfh92955yix1ln23"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; From e2d5470b1798bacbe3f0f6c760b6c8a6fdd1b006 Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Sun, 18 Nov 2018 08:27:39 +0100 Subject: [PATCH 2/2] xidlehook: Fix darwin build ... I think --- pkgs/tools/X11/xidlehook/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 0cfd9e218ca..54ab6a3c803 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, rustPlatform, fetchFromGitLab -, xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf }: +, xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf, Security }: rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; cargoSha256 = "1pdhbqnkgwp2v5zyin8z8049aq8c3kfk04v9wsbz8qla34rgi99s"; - buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ]; + buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig patchelf ]; postFixup = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3fb6d7dcb5..976092caee3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6326,7 +6326,9 @@ with pkgs; xiccd = callPackage ../tools/misc/xiccd { }; - xidlehook = callPackage ../tools/X11/xidlehook {}; + xidlehook = callPackage ../tools/X11/xidlehook { + inherit (darwin.apple_sdk.frameworks) Security; + }; xorriso = callPackage ../tools/cd-dvd/xorriso { };