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,4 +1,5 @@
|
||||
{ stdenv, fetchurl, fetchpatch, devicemapper, json_c, openssl, libuuid, pkgconfig, popt
|
||||
{ stdenv, fetchurl, fetchpatch, lvm2, json_c
|
||||
, openssl, libuuid, pkgconfig, popt
|
||||
, enablePython ? false, python2 ? null }:
|
||||
|
||||
assert enablePython -> python2 != null;
|
||||
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
] ++ stdenv.lib.optional enablePython "--enable-python";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ devicemapper json_c openssl libuuid popt ]
|
||||
buildInputs = [ lvm2 json_c openssl libuuid popt ]
|
||||
++ stdenv.lib.optional enablePython python2;
|
||||
|
||||
meta = {
|
||||
|
||||
Reference in New Issue
Block a user