From 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 17 Jul 2018 16:11:16 -0400 Subject: treewide: remove aliases in nixpkgs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- pkgs/os-specific/linux/pm-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/pm-utils') 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 ]; -- cgit 1.4.1