b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #116952 from gebner/3mf211

Browse source 
lib3mf: 2.0.0 -> 2.1.1
This commit is contained in:
Gabriel Ebner 2021-03-21 11:48:42 +01:00 committed by GitHub
parent c430ccbb77 1a5ccd1339
commit 0b8642bed8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 59 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkgs/development/libraries/lib3mf/default.nix
View file

@ -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" ];
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 = ''
rmdir Tests/googletest
ln -s ${gtest.src} Tests/googletest
# 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; {

33
pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix Normal file
View file

@ -0,0 +1,33 @@
{ stdenv, lib, fetchFromGitHub, go }:
stdenv.mkDerivation rec {
pname = "AutomaticComponentToolkit";
version = "1.6.0";
src = fetchFromGitHub {
owner = "Autodesk";
repo = pname;
rev = "v${version}";
sha256 = "1r0sbw82cf9dbcj3vgnbd4sc1lklzvijic2z5wgkvs21azcm0yzh";
};
nativeBuildInputs = [ go ];
buildPhase = ''
cd Source
export HOME=/tmp
go build -o act *.go
'';
installPhase = ''
install -Dm0755 act $out/bin/act
'';
meta = with lib; {
description = "Toolkit to automatically generate software components: abstract API, implementation stubs and language bindings";
homepage = "https://github.com/Autodesk/AutomaticComponentToolkit";
license = licenses.bsd2;
maintainers = with maintainers; [ gebner ];
platforms = platforms.all;
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -11982,6 +11982,8 @@ in
astyle = callPackage ../development/tools/misc/astyle { };
automaticcomponenttoolkit = callPackage ../development/tools/misc/automaticcomponenttoolkit { };
awf = callPackage ../development/tools/misc/awf { };
aws-adfs = with python3Packages; toPythonApplication aws-adfs;