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: 6141939d6e0a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 797e0d84a180
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 7, 2018

  1. shadowsocks-libev: set install name correctly 

    This avoids having to invoke install_name_tool.
    @matthewbauer
    matthewbauer committed Nov 7, 2018
    Copy the full SHA
    147ff75 View commit details

  2. clucene-core: fix install name

    @matthewbauer
    matthewbauer committed Nov 7, 2018
    Copy the full SHA
    8511f04 View commit details

  3. podofo: cleanup

    @matthewbauer
    matthewbauer committed Nov 7, 2018
    Copy the full SHA
    797e0d8 View commit details
Showing with 19 additions and 37 deletions.
  1. +8 −8 pkgs/development/libraries/clucene-core/2.x.nix
  2. +8 −14 pkgs/development/libraries/podofo/default.nix
  3. +3 −15 pkgs/tools/networking/shadowsocks-libev/default.nix
16 changes: 8 additions & 8 deletions pkgs/development/libraries/clucene-core/2.x.nix
View file
Original file line number Diff line number Diff line change
@@ -12,21 +12,21 @@ stdenv.mkDerivation rec {

buildInputs = [ boost zlib ];

cmakeFlags = [ "-DBUILD_CONTRIBS=ON" "-DBUILD_CONTRIBS_LIB=ON" ];
cmakeFlags = [
"-DBUILD_CONTRIBS=ON"
"-DBUILD_CONTRIBS_LIB=ON"
"-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
];

patches = # From debian
[ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch
./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch
./Install-contribs-lib.patch
] ++ stdenv.lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ];

postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
install_name_tool -change libclucene-shared.1.dylib \
$out/lib/libclucene-shared.1.dylib \
$out/lib/libclucene-core.1.dylib
'';

doCheck = false; # fails with "Unable to find executable: /build/clucene-core-2.3.3.4/build/bin/cl_test"
# fails with "Unable to find executable:
# /build/clucene-core-2.3.3.4/build/bin/cl_test"
doCheck = false;

meta = with stdenv.lib; {
description = "Core library for full-featured text search engine";
22 changes: 8 additions & 14 deletions pkgs/development/libraries/podofo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9";
};

propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ];

patches = [
# https://sourceforge.net/p/podofo/tickets/24/
(fetchpatch {
@@ -23,20 +21,16 @@ stdenv.mkDerivation rec {
})
];

# TODO(@Dridus) remove the ++ ghc5 at next hash break
nativeBuildInputs = [ cmake pkgconfig ] ++ stdenv.lib.optional stdenv.isLinux gcc5;

# TODO(@Dridus) remove the ++ libc at next hash break
buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc;
nativeBuildInputs = [ cmake pkgconfig ];

cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";

postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
for i in $out/bin/* ; do
install_name_tool -change libpodofo.${version}.dylib $out/lib/libpodofo.${version}.dylib "$i"
done
'';
buildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng
libidn expat lua5 ];

cmakeFlags = [
"-DPODOFO_BUILD_SHARED=ON"
"-DPODOFO_BUILD_STATIC=OFF"
"-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
];
meta = with stdenv.lib; {
homepage = http://podofo.sourceforge.net;
description = "A library to work with the PDF file format";
18 changes: 3 additions & 15 deletions pkgs/tools/networking/shadowsocks-libev/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,27 +16,15 @@ stdenv.mkDerivation rec {
};

buildInputs = [ libsodium mbedtls libev c-ares pcre ];
nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ];
nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45
docbook_xsl libxslt ];

cmakeFlags = [ "-DWITH_STATIC=OFF" ];
cmakeFlags = [ "-DWITH_STATIC=OFF" "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ];

postInstall = ''
cp lib/* $out/lib
chmod +x $out/bin/*
mv $out/pkgconfig $out/lib
${stdenv.lib.optionalString stdenv.isDarwin ''
install_name_tool -change libcork.dylib $out/lib/libcork.dylib $out/lib/libipset.dylib
install_name_tool -change libbloom.dylib $out/lib/libbloom.dylib $out/lib/libipset.dylib
for exe in $out/bin/*; do
install_name_tool -change libmbedtls.dylib ${mbedtls}/lib/libmbedtls.dylib $exe
install_name_tool -change libmbedcrypto.dylib ${mbedtls}/lib/libmbedcrypto.dylib $exe
install_name_tool -change libcork.dylib $out/lib/libcork.dylib $exe
install_name_tool -change libipset.dylib $out/lib/libipset.dylib $exe
install_name_tool -change libbloom.dylib $out/lib/libbloom.dylib $exe
done
''}
'';

meta = with stdenv.lib; {