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, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus-glib, libxml2 }:
|
||||
{ stdenv, fetchFromGitHub, autoconf, automake, libtool
|
||||
, pkgconfig, dbus, dbus-glib, libxml2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "thermald-${version}";
|
||||
@@ -12,12 +13,12 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ autoconf automake libtool dbus_libs dbus-glib libxml2 ];
|
||||
buildInputs = [ autoconf automake libtool dbus dbus-glib libxml2 ];
|
||||
|
||||
patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am'';
|
||||
|
||||
preConfigure = ''
|
||||
export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||
export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user