nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 01:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #194941 from Artturin/libxml2strict

Browse Source
This commit is contained in:
Artturi 2022-10-08 17:46:42 +03:00 committed by GitHub
commit f9f82fdb05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/lib/make-options-doc/default.nix
View File

@ -122,7 +122,7 @@ in rec {
optionsJSON = pkgs.runCommand "options.json"
{ meta.description = "List of NixOS options in JSON format";
buildInputs = [
nativeBuildInputs = [
pkgs.brotli
(let
self = (pkgs.python3Minimal.override {

7
pkgs/development/libraries/libxml2/default.nix
View File

@ -12,7 +12,7 @@
, ncurses
, findXMLCatalogs
, libiconv
, pythonSupport ? enableShared && stdenv.buildPlatform == stdenv.hostPlatform
, pythonSupport ? enableShared
, icuSupport ? false
, icu
, enableShared ? stdenv.hostPlatform.libc != "msvcrt" && !stdenv.hostPlatform.isStatic
@ -60,6 +60,8 @@ stdenv.mkDerivation rec {
})
];
strictDeps = true;
nativeBuildInputs = [
pkg-config
autoreconfHook
@ -94,7 +96,8 @@ stdenv.mkDerivation rec {
(lib.enableFeature enableStatic "static")
(lib.enableFeature enableShared "shared")
(lib.withFeature icuSupport "icu")
(lib.withFeatureAs pythonSupport "python" python)
(lib.withFeature pythonSupport "python")
(lib.optionalString pythonSupport "PYTHON=${python.pythonForBuild.interpreter}")
];
installFlags = lib.optionals pythonSupport [

7
pkgs/development/libraries/libxslt/default.nix
View File

@ -10,7 +10,7 @@
, ncurses
, libgcrypt
, cryptoSupport ? false
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
, pythonSupport ? true
, gnome
}:
@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
sha256 = "EoSPCkQI9ltTDTlizZ/2cLaueWGRz+/zdSK1dy3o3I4=";
};
strictDeps = true;
nativeBuildInputs = [
pkg-config
autoreconfHook
@ -51,7 +53,8 @@ stdenv.mkDerivation rec {
"--without-debug"
"--without-mem-debug"
"--without-debugger"
(lib.withFeatureAs pythonSupport "python" python)
(lib.withFeature pythonSupport "python")
(lib.optionalString pythonSupport "PYTHON=${python.pythonForBuild.interpreter}")
] ++ lib.optionals (!cryptoSupport) [
"--without-crypto"
];