suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Updated solvespace

Browse Source
This commit is contained in:
Georges Dupéron 2017-03-17 17:04:56 +01:00
parent af4a629538
commit d6f925d7c1
1 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pkgs/applications/graphics/solvespace/default.nix
View File

@ -1,26 +1,53 @@
{ stdenv, fetchgit, autoreconfHook, fltk13 { stdenv, fetchgit, cmake, fltk13
, libjpeg, libpng, mesa, pkgconfig }: , zlib, libjpeg, libpng, cairo, freetype
, json_c, fontconfig, gtkmm3, pangomm, mesa, libspnav
, pcre, libpthreadstubs, libXdmcp, libX11, libxkbcommon, epoxy, at_spi2_core, dbus, gettext
, pkgconfig
}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "solvespace-2.0"; name = "solvespace-3.0";
src = fetchgit { src = fetchgit {
url = "https://github.com/jwesthues/solvespace.git"; url = "https://github.com/solvespace/solvespace.git";
sha256 = "0m6zlx1kiqxkm6szdsnywwr6spnb7xjg6vqsq30nrr44cx37w861"; #https://github.com/jwesthues/solvespace.git";
rev = "e587d0e"; sha256 = "1n3p6zic1w5fvw85af8pl5mhmfqai67pd0dfr1qanbanydv4xh9c";
rev = "911c67b";
leaveDotGit = true;
}; };
# e587d0e fails with undefined reference errors if make is called # e587d0e fails with undefined reference errors if make is called
# twice. Ugly workaround: Build while installing. # twice. Ugly workaround: Build while installing.
dontBuild = true; #dontBuild = true;
enableParallelBuilding = false; enableParallelBuilding = false;
buildInputs = [ buildInputs = [
autoreconfHook cmake
fltk13 fltk13
zlib
libjpeg libjpeg
libpng libpng
cairo
freetype
json_c
fontconfig
gtkmm3
pangomm
mesa mesa
libspnav
pcre
libpthreadstubs
libXdmcp
libX11
pkgconfig pkgconfig
libxkbcommon
epoxy
at_spi2_core
dbus
gettext
];
NIX_CFLAGS_COMPILE = [
"-I${pangomm}/lib/pangomm-1.4/include"
]; ];
meta = { meta = {