diff options
| author | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-17 16:11:16 -0400 |
|---|---|---|
| committer | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-18 23:25:20 -0400 |
| commit | 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 (patch) | |
| tree | 0325a27e51eb7bed006c1ef958e6312ac1d995c4 /pkgs/tools/X11/xidlehook | |
| parent | d7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff) | |
| download | nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.gz nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.bz2 nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.lz nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.xz nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.zst nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.zip | |
treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
Diffstat (limited to 'pkgs/tools/X11/xidlehook')
| -rw-r--r-- | pkgs/tools/X11/xidlehook/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 2faa8ead0716..b96235341401 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf }: +{ lib, stdenv, rustPlatform, fetchFromGitHub +, xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf }: rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; @@ -17,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; cargoSha256 = "1mrg59flmmqg5wwi2l8lw6p1xpgdw597fdfsmpn8b126rgzqmjl8"; - buildInputs = [ x11 xorg.libXScrnSaver libpulseaudio ]; + buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ]; nativeBuildInputs = [ pkgconfig patchelf ]; postFixup = lib.optionalString stdenv.isLinux '' |