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:
@@ -4,7 +4,8 @@
|
||||
, utillinuxMinimal ? null
|
||||
|
||||
# this is just for tests (not in closure of any regular package)
|
||||
, coreutils, dbus_daemon, libxml2, tzdata, desktop-file-utils, shared-mime-info, doCheck ? false
|
||||
, coreutils, dbus, libxml2, tzdata, desktop-file-utils
|
||||
, shared-mime-info, doCheck ? false
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
@@ -121,7 +122,7 @@ stdenv.mkDerivation rec {
|
||||
export XDG_RUNTIME_HOME="$TMP"
|
||||
export HOME="$TMP"
|
||||
export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share"
|
||||
export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon"
|
||||
export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon"
|
||||
export PATH="$PATH:$(pwd)/gobject"
|
||||
echo "PATH=$PATH"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user