From fb3de84fb3af6326d49a889490a9ef54f1e281fa Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:20:41 -0500 Subject: xidlehook: use buildFeatures --- pkgs/tools/X11/xidlehook/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/tools/X11/xidlehook') diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index ac5d6fc964bbe..a19de0530bd1e 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -25,12 +25,14 @@ rustPlatform.buildRustPackage rec { sha256 = "1pl7f8fhxfcy0c6c08vkagp0x1ak96vc5wgamigrk1nkd6l371lb"; }; - cargoBuildFlags = lib.optionals (!stdenv.isLinux) [ "--no-default-features" "--features" "pulse" ]; cargoSha256 = "1y7m61j07gvqfqz97mda39nc602sv7a826c06m8l22i7z380xfms"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config patchelf python3 ]; + buildNoDefaultFeatures = !stdenv.isLinux; + buildFeatures = lib.optional (!stdenv.isLinux) "pulse"; + postFixup = lib.optionalString stdenv.isLinux '' RPATH="$(patchelf --print-rpath $out/bin/xidlehook)" patchelf --set-rpath "$RPATH:${libpulseaudio}/lib" $out/bin/xidlehook -- cgit 1.4.1