ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Slic3r: Bump to 1.1.7.

Browse Source
This commit is contained in:
Moritz Ulrich 2014-08-20 16:27:47 +02:00
parent bf0e265a61
commit 77437983a2
3 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/applications/misc/slic3r/default.nix
View File

@ -1,25 +1,23 @@
{ stdenv, fetchgit, perl, makeWrapper, makeDesktopItem { stdenv, fetchgit, perl, makeWrapper, makeDesktopItem
# Perl modules: , which, perlPackages
, EncodeLocale, MathClipper, ExtUtilsXSpp, BoostGeometryUtils
, MathConvexHullMonotoneChain, MathGeometryVoronoi, MathPlanePath, Moo
, IOStringy, ClassXSAccessor, Wx, GrowlGNTP, NetDBus
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.10b"; version = "1.1.7";
name = "slic3r-${version}"; name = "slic3r-${version}";
# Slic3r doesn't put out tarballs, only a git repository is available # Slic3r doesn't put out tarballs, only a git repository is available
src = fetchgit { src = fetchgit {
url = "git://github.com/alexrj/Slic3r"; url = "git://github.com/alexrj/Slic3r";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "0j06h0z65qn4kyb2b7pnq6bcn4al60q227iz9jlrin0ffx3l0ra7"; sha256 = "0hss90iw4xwca08d03wrz0fds5nqwb9zjqii2n6rgpcl4km69fka";
}; };
buildInputs = [ perl makeWrapper buildInputs = with perlPackages; [ perl makeWrapper which
EncodeLocale MathClipper ExtUtilsXSpp BoostGeometryUtils EncodeLocale MathClipper ExtUtilsXSpp BoostGeometryUtils
MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo
IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX
ExtUtilsMakeMaker
]; ];
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -32,13 +30,23 @@ stdenv.mkDerivation rec {
categories = "Application;Development;"; categories = "Application;Development;";
}; };
# Nothing to do here buildPhase = ''
buildPhase = "true"; export SLIC3R_NO_AUTO=true
export PERL5LIB="./xs/blib/arch/:./xs/blib/lib:$PERL5LIB"
pushd xs
perl Build.PL
perl Build
popd
perl Build.PL
'';
installPhase = '' installPhase = ''
mkdir -p "$out/share/slic3r/" mkdir -p "$out/share/slic3r/"
cp -r * "$out/share/slic3r/" cp -r * "$out/share/slic3r/"
wrapProgram "$out/share/slic3r/slic3r.pl" --prefix PERL5LIB : $PERL5LIB wrapProgram "$out/share/slic3r/slic3r.pl" \
--prefix PERL5LIB : "$out/share/slic3r/xs/blib/arch:$out/share/slic3r/xs/blib/lib:$PERL5LIB"
mkdir -p "$out/bin" mkdir -p "$out/bin"
ln -s "$out/share/slic3r/slic3r.pl" "$out/bin/slic3r" ln -s "$out/share/slic3r/slic3r.pl" "$out/bin/slic3r"
mkdir -p "$out/share/pixmaps/" mkdir -p "$out/share/pixmaps/"
@ -57,6 +65,6 @@ stdenv.mkDerivation rec {
homepage = http://slic3r.org/; homepage = http://slic3r.org/;
license = licenses.agpl3; license = licenses.agpl3;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ]; maintainers = with maintainers; [ bjornfor the-kenny ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -9655,9 +9655,7 @@ let
# slic3r 0.9.10b says: "Running Slic3r under Perl >= 5.16 is not supported nor recommended" # slic3r 0.9.10b says: "Running Slic3r under Perl >= 5.16 is not supported nor recommended"
slic3r = callPackage ../applications/misc/slic3r { slic3r = callPackage ../applications/misc/slic3r {
inherit (perl514Packages) EncodeLocale MathClipper ExtUtilsXSpp perlPackages = perl514Packages;
BoostGeometryUtils MathConvexHullMonotoneChain MathGeometryVoronoi
MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus;
perl = perl514; perl = perl514;
}; };

21
pkgs/top-level/perl-packages.nix
View File

@ -4407,6 +4407,19 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
ImportInto = buildPerlPackage {
name = "Import-Into-1.002004";
src = fetchurl {
url = mirror://cpan/authors/id/E/ET/ETHER/Import-Into-1.002004.tar.gz;
sha256 = "110hifk3cj14lxgjq2vaa2qfja21gll4lpn8vbimy0gzqadjbjyy";
};
propagatedBuildInputs = [ ModuleRuntime ];
meta = {
description = "Import packages into other packages";
license = "perl";
};
};
IOAll = buildPerlPackage { IOAll = buildPerlPackage {
name = "IO-All-0.60"; name = "IO-All-0.60";
src = fetchurl { src = fetchurl {
@ -5680,12 +5693,12 @@ let self = _self // overrides; _self = with self; {
}; };
Moo = buildPerlPackage { Moo = buildPerlPackage {
name = "Moo-1.000007"; name = "Moo-1.006000";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/M/MS/MSTROUT/Moo-1.000007.tar.gz; url = mirror://cpan/authors/id/H/HA/HAARG/Moo-1.006000.tar.gz;
sha256 = "02q5j5vsfv8ykzmkqk8zac88svard4g6rl455slgz8y2w3xn41ql"; sha256 = "0gjh6dyz825cwjibq2wlpx14drjqx4pxxh931p4x3jd2617hax17";
}; };
buildInputs = [ TestFatal ]; buildInputs = [ TestFatal ImportInto ];
propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny strictures ]; propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny strictures ];
meta = { meta = {
description = "Minimalist Object Orientation (with Moose compatiblity)"; description = "Minimalist Object Orientation (with Moose compatiblity)";