public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove aliases in nixpkgs

Browse Source 
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
This commit is contained in:
Matthew Bauer
2018-07-18 23:25:20 -04:00
parent d7d31fea7e
commit 76999cc40e
167 changed files with 460 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/bluetooth/obex-data-server/default.nix
+5 -5
View File
@@ -1,21 +1,21 @@
{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus_libs }:
{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus }:
stdenv.mkDerivation rec {
name = "obex-data-server-0.4.6";
src = fetchurl {
url = "http://tadas.dailyda.com/software/${name}.tar.gz";
sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libusb glib dbus-glib bluez openobex dbus_libs ];
buildInputs = [ libusb glib dbus-glib bluez openobex dbus ];
patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ];
preConfigure = ''
addToSearchPath PKG_CONFIG_PATH ${openobex}/lib64/pkgconfig
export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
'';
meta = {