diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/development/libraries/lib3mf | |
parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/lib3mf')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/lib3mf/default.nix | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/libraries/lib3mf/default.nix b/nixpkgs/pkgs/development/libraries/lib3mf/default.nix index fec910bd5952..b75b1b833d73 100644 --- a/nixpkgs/pkgs/development/libraries/lib3mf/default.nix +++ b/nixpkgs/pkgs/development/libraries/lib3mf/default.nix @@ -1,26 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, libuuid, libossp_uuid, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, ninja, automaticcomponenttoolkit +, pkg-config, libzip, gtest, openssl, libuuid, libossp_uuid }: stdenv.mkDerivation rec { pname = "lib3mf"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "3MFConsortium"; repo = pname; rev = "v${version}"; - sha256 = "0w4d9zvl95g1x3r5nyd6cr27g6fwhhwaivh8a5r1xs5l6if21x19"; + sha256 = "1417xlxc1y5jnipixhbjfrrjgkrprbbraj8647sff9051m3hpxc3"; }; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ]; + outputs = [ "out" "dev" ]; - postPatch = '' - rmdir Tests/googletest - ln -s ${gtest.src} Tests/googletest + cmakeFlags = [ + "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "out"}/include/lib3mf" + "-DUSE_INCLUDED_ZLIB=OFF" + "-DUSE_INCLUDED_LIBZIP=OFF" + "-DUSE_INCLUDED_GTEST=OFF" + "-DUSE_INCLUDED_SSL=OFF" + ]; + + buildInputs = [ + libzip gtest openssl + ] ++ (if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ]); + postPatch = '' # fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ - sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3MF.pc.in + sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3mf.pc.in + + # replace bundled binaries + for i in AutomaticComponentToolkit/bin/act.*; do + ln -sf ${automaticcomponenttoolkit}/bin/act $i + done ''; meta = with lib; { |