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:
@@ -2,7 +2,7 @@
|
||||
, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
|
||||
, doxygen, pcre, libpthreadstubs, libXdmcp
|
||||
|
||||
, oceSupport ? true, opencascade_oce
|
||||
, oceSupport ? true, opencascade
|
||||
, ngspiceSupport ? true, libngspice
|
||||
, scriptingSupport ? true, swig, python, wxPython
|
||||
}:
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
cmakeFlags =
|
||||
optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade_oce}" ]
|
||||
optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ]
|
||||
++ optional (ngspiceSupport) "-DKICAD_SPICE=ON"
|
||||
++ optionals (scriptingSupport) [
|
||||
"-DKICAD_SCRIPTING=ON"
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
|
||||
cairo curl openssl boost
|
||||
] ++ optional (oceSupport) opencascade_oce
|
||||
] ++ optional (oceSupport) opencascade
|
||||
++ optional (ngspiceSupport) libngspice
|
||||
++ optionals (scriptingSupport) [ swig python wxPython ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user