diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f7c328bf76..adca2983fe5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10585,13 +10585,9 @@ in then callPackage ../development/libraries/gnu-efi { } else null; - gnutls = callPackage - (if stdenv.isDarwin - # Avoid > 3.5.10 due to frameworks for now; see discussion on: - # https://github.com/NixOS/nixpkgs/commit/d6454e6a1 - then ../development/libraries/gnutls/3.5.10.nix - else ../development/libraries/gnutls/3.6.nix) - { }; + gnutls = callPackage ../development/libraries/gnutls/default.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { gperf = gperf_3_0; @@ -16058,8 +16054,12 @@ in docbook_xml_ebnf_dtd = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf { }; inherit (callPackages ../data/sgml+xml/stylesheets/xslt/docbook-xsl { }) - docbook_xsl - docbook_xsl_ns; + docbook-xsl-nons + docbook-xsl-ns; + + # TODO: move this to aliases + docbook_xsl = docbook-xsl-nons; + docbook_xsl_ns = docbook-xsl-ns; documentation-highlighter = callPackage ../misc/documentation-highlighter { }; |