summary refs log tree commit diff
path: root/pkgs/build-support
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/build-support
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/build-support')
-rw-r--r--pkgs/build-support/rust/default-crate-overrides.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index d82a92042307..9d22fcf8be17 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -1,5 +1,5 @@
 { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2,
-  openssl, sqlite, zlib, dbus_libs, dbus-glib, gdk_pixbuf, cairo, python3,
+  openssl, sqlite, zlib, dbus, dbus-glib, gdk_pixbuf, cairo, python3,
   libsodium, postgresql, ... }:
 
 let
@@ -41,10 +41,10 @@ in
   };
 
   dbus = attrs: {
-    buildInputs = [ pkgconfig dbus_libs ];
+    buildInputs = [ pkgconfig dbus ];
   };
   libdbus-sys = attrs: {
-    buildInputs = [ pkgconfig dbus_libs ];
+    buildInputs = [ pkgconfig dbus ];
   };
   gobject-sys = attrs: {
     buildInputs = [ dbus-glib ];