diff options
author | Carles Pagès <page@cubata.homelinux.net> | 2015-07-13 14:27:56 +0200 |
---|---|---|
committer | Carles Pagès <cpages@aqsense.com> | 2015-07-13 14:31:48 +0200 |
commit | 3cee0c8524f35686d8d7afa4d06d9a8704947e13 (patch) | |
tree | 8eb5146c8982e77fb20d6acddbdd7014a27517b4 /pkgs/development/libraries/jsoncpp | |
parent | 1e9561ff393e07d935d62cfaeb609d0c77040ebb (diff) | |
download | nixpkgs-3cee0c8524f35686d8d7afa4d06d9a8704947e13.tar nixpkgs-3cee0c8524f35686d8d7afa4d06d9a8704947e13.tar.gz nixpkgs-3cee0c8524f35686d8d7afa4d06d9a8704947e13.tar.bz2 nixpkgs-3cee0c8524f35686d8d7afa4d06d9a8704947e13.tar.lz nixpkgs-3cee0c8524f35686d8d7afa4d06d9a8704947e13.tar.xz nixpkgs-3cee0c8524f35686d8d7afa4d06d9a8704947e13.tar.zst nixpkgs-3cee0c8524f35686d8d7afa4d06d9a8704947e13.zip |
jsoncpp: the shared lib was not being built
Since the last version update only the static lib was built, and even that was removed in the last commit. Fix shared ones, which is what we want. Also, add myself to maintainers.
Diffstat (limited to 'pkgs/development/libraries/jsoncpp')
-rw-r--r-- | pkgs/development/libraries/jsoncpp/default.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 9e5ac769616..8bb1d40b2a9 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -20,19 +20,25 @@ stdenv.mkDerivation rec { export sourceRoot=${src.name} ''; + # Hack to be able to run the test, broken because we use + # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install + preBuild = '' + export LD_LIBRARY_PATH="`pwd`/src/lib_json:$LD_LIBRARY_PATH" + ''; + nativeBuildInputs = [ cmake python ]; cmakeFlags = [ - "-DJSONCPP_WITH_CMAKE_PACKAGE=1" + "-DJSONCPP_LIB_BUILD_SHARED=ON" + "-DJSONCPP_LIB_BUILD_STATIC=OFF" + "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" ]; - postInstall = "rm $out/lib/*.a"; - meta = { inherit version; homepage = https://github.com/open-source-parsers/jsoncpp; description = "A simple API to manipulate JSON data in C++"; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + maintainers = with stdenv.lib.maintainers; [ ttuegel page ]; license = stdenv.lib.licenses.mit; branch = "1.6"; }; |