about summary refs log tree commit diff
path: root/pkgs/tools/misc/os-prober
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/tools/misc/os-prober
parentd7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff)
downloadnixlib-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/misc/os-prober')
-rw-r--r--pkgs/tools/misc/os-prober/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix
index c4a304e0d284..6211c863bd49 100644
--- a/pkgs/tools/misc/os-prober/default.nix
+++ b/pkgs/tools/misc/os-prober/default.nix
@@ -4,7 +4,7 @@ coreutils,  # mktemp
 grub2,      # grub-mount and grub-probe
 cryptsetup, # cryptsetup
 libuuid,    # blkid and blockdev
-libudev,    # udevadm udevinfo
+udev,    # udevadm udevinfo
 ntfs3g      # ntfs3g
 }:
 
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     done;
     for file in $out/bin/*; do
       wrapProgram $file \
-        --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 libudev coreutils cryptsetup libuuid ntfs3g ]} \
+        --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g ]} \
         --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober"
     done;
   '';