summary refs log tree commit diff
path: root/pkgs/os-specific/linux/pm-utils
diff options
context:
space:
mode:
authorMatthew Bauer <matthew.bauer@obsidian.systems>2018-07-17 16:11:16 -0400
committerMatthew Bauer <matthew.bauer@obsidian.systems>2018-07-18 23:25:20 -0400
commit76999cc40e6c4cbfe817b3b6f125ece999ae9b73 (patch)
tree0325a27e51eb7bed006c1ef958e6312ac1d995c4 /pkgs/os-specific/linux/pm-utils
parentd7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff)
downloadnixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.gz
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.bz2
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.lz
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.xz
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.zst
nixpkgs-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/os-specific/linux/pm-utils')
-rw-r--r--pkgs/os-specific/linux/pm-utils/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix
index 326ba444957..a5577b97b87 100644
--- a/pkgs/os-specific/linux/pm-utils/default.nix
+++ b/pkgs/os-specific/linux/pm-utils/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, coreutils, gnugrep, utillinux, kmod
-, procps, kbd, dbus_tools }:
+, procps, kbd, dbus }:
 
 let
 
   binPath = stdenv.lib.makeBinPath
-    [ coreutils gnugrep utillinux kmod procps kbd dbus_tools ];
+    [ coreutils gnugrep utillinux kmod procps kbd dbus ];
 
   sbinPath = stdenv.lib.makeSearchPathOutput "bin" "sbin"
     [ procps ];