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
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchpatch, fetchurl, lib, openssl, pkgconfig, libnl
|
||||
, dbus_libs ? null, readline ? null, pcsclite ? null
|
||||
, dbus, readline ? null, pcsclite ? null
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
CONFIG_EAP_AKA=y
|
||||
CONFIG_EAP_AKA_PRIME=y
|
||||
CONFIG_PCSC=y
|
||||
'' + optionalString (dbus_libs != null) ''
|
||||
'' + optionalString (dbus != null) ''
|
||||
CONFIG_CTRL_IFACE_DBUS=y
|
||||
CONFIG_CTRL_IFACE_DBUS_NEW=y
|
||||
CONFIG_CTRL_IFACE_DBUS_INTRO=y
|
||||
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
||||
-I${stdenv.lib.getDev pcsclite}/include/PCSC/"
|
||||
'';
|
||||
|
||||
buildInputs = [ openssl libnl dbus_libs readline pcsclite ];
|
||||
buildInputs = [ openssl libnl dbus readline pcsclite ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user