Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 152338216022
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0697ad33c0bb
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 13, 2020

  1. libxslt: fix darwin build 

        ld: library not found for -lintl
    clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
    make[3]: *** [Makefile:544: libxsltmod.la] Error 1
    @LnL7
    LnL7 committed Jun 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0697ad3 View commit details
Showing with 5 additions and 6 deletions.
  1. +5 −6 pkgs/development/libraries/libxslt/default.nix
11 changes: 5 additions & 6 deletions pkgs/development/libraries/libxslt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python, libgcrypt
{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python, libgcrypt
, cryptoSupport ? false
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
}:

with stdenv.lib;

stdenv.mkDerivation rec {
pname = "libxslt";
version = "1.1.34";
@@ -17,6 +15,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py";

buildInputs = [ libxml2.dev ]
++ stdenv.lib.optional stdenv.isDarwin gettext
++ stdenv.lib.optionals pythonSupport [ libxml2.py python ]
++ stdenv.lib.optionals cryptoSupport [ libgcrypt ];

@@ -27,14 +26,14 @@ stdenv.mkDerivation rec {
"--without-debug"
"--without-mem-debug"
"--without-debugger"
] ++ optional pythonSupport "--with-python=${python}"
++ optional (!cryptoSupport) "--without-crypto";
] ++ stdenv.lib.optional pythonSupport "--with-python=${python}"
++ stdenv.lib.optional (!cryptoSupport) "--without-crypto";

postFixup = ''
moveToOutput bin/xslt-config "$dev"
moveToOutput lib/xsltConf.sh "$dev"
moveToOutput share/man/man1 "$bin"
'' + optionalString pythonSupport ''
'' + stdenv.lib.optionalString pythonSupport ''
mkdir -p $py/nix-support
echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs
moveToOutput ${python.libPrefix} "$py"