public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50720 from Moredread/slic3r-prusa3d/1.41.1-fixes

Browse Source 
slic3r-prusa3d: multiple fixes
This commit is contained in:
Renaud 2018-11-28 15:38:25 +01:00 committed by GitHub
commit b5784b42b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/slic3r/prusa3d.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, { stdenv, lib, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU, boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU,
glew, eigen, curl, gtest, nlopt, pcre, xorg }: glew, eigen, curl, gtest, nlopt, pcre, xorg }:
let let
@ -98,6 +98,10 @@ stdenv.mkDerivation rec {
# seems to be the easiest way. # seems to be the easiest way.
sed -i "s|\''${PERL_VENDORARCH}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt sed -i "s|\''${PERL_VENDORARCH}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt
sed -i "s|\''${PERL_VENDORLIB}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt sed -i "s|\''${PERL_VENDORLIB}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt
'' + lib.optionalString (lib.versionOlder "2.5" nlopt.version) ''
# Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx
# now seems to be integrated into the main lib.
sed -i 's|nlopt_cxx|nlopt|g' xs/src/libnest2d/cmake_modules/FindNLopt.cmake
''; '';
postInstall = '' postInstall = ''
@ -114,7 +118,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "prusa3d"; owner = "prusa3d";
repo = "Slic3r"; repo = "Slic3r";
sha256 = "0068wwsjwmnxql7653vy3labcyslzf17kr8xdr4lg2jplm022hvy"; sha256 = "0crjrll8cjpkllval6abrqzvzp8g3rnb4vmwi5vivw0jvdv3w5y7";
rev = "version_${version}"; rev = "version_${version}";
}; };

9
pkgs/development/libraries/nlopt/default.nix
View File

@ -1,13 +1,8 @@
{ fetchurl, stdenv, octave ? null, cmake }: { fetchurl, stdenv, octave ? null, cmake }:
let stdenv.mkDerivation rec {
version = "2.5.0";
in
stdenv.mkDerivation {
name = "nlopt-${version}"; name = "nlopt-${version}";
version = "2.5.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/stevengj/nlopt/archive/v${version}.tar.gz"; url = "https://github.com/stevengj/nlopt/archive/v${version}.tar.gz";