git.iko.soy/typeable/nixpkgs
on master help sign in
wings3d: 1.5.4 -> 2.2.1
commit70a05bcfaab04de980c70ac42934cf17636cad07 authorMilan Svoboda <milan.svoboda@centrum.cz> dateSun 30 Dec 2018, 15:25 (8 years ago) parentc485a49
3 files changed+16−50
pkgs/applications/graphics/wings/default.nix+15−14 pkgs/development/libraries/esdl/default.nix−32 pkgs/top-level/all-packages.nix+1−4
pkgs/applications/graphics/wings/default.nix+15−14
@@ -1,34 +1,35 @@
1−{ fetchurl, stdenv, erlang, esdl, cl }:
1+{ fetchurl, stdenv, erlang, cl, libGL, libGLU }:
22
33stdenv.mkDerivation rec {
4− name = "wings-1.5.4";
4+ name = "wings-2.2.1";
55 src = fetchurl {
66 url = "mirror://sourceforge/wings/${name}.tar.bz2";
7− sha256 = "0qz6rmmkqgk3p0d3v2ikkf22n511bq0m7xp3kkradwrp28fcl15x";
7+ sha256 = "1adlq3wd9bz0hjznpzsgilxgsbhr0kk01f06872mq37v4cbw76bh";
88 };
99
10− ERL_LIBS = "${esdl}/lib/erlang/lib:${cl}/lib/erlang/lib";
10+ ERL_LIBS = "${cl}/lib/erlang/lib";
1111
1212 patchPhase = ''
13− sed -i 's,include("sdl_keyboard.hrl"),include_lib("esdl/include/sdl_keyboard.hrl"),' \
14− src/wings_body.erl plugins_src/commands/wpc_constraints.erl
15−
16− # Fix reference
17− sed -i 's,wings/e3d/,,' plugins_src/import_export/wpc_lwo.erl
13+ sed -i 's,-Werror ,,' e3d/Makefile
14+ sed -i 's,../../wings/,../,' icons/Makefile
15+ find plugins_src -mindepth 2 -type f -name "*.[eh]rl" -exec sed -i 's,wings/src/,../../src/,' {} \;
16+ find plugins_src -mindepth 2 -type f -name "*.[eh]rl" -exec sed -i 's,wings/e3d/,../../e3d/,' {} \;
17+ find plugins_src -mindepth 2 -type f -name "*.[eh]rl" -exec sed -i 's,wings/intl_tools/,../../intl_tools/,' {} \;
18+ find . -type f -name "*.[eh]rl" -exec sed -i 's,wings/src/,../src/,' {} \;
19+ find . -type f -name "*.[eh]rl" -exec sed -i 's,wings/e3d/,../e3d/,' {} \;
20+ find . -type f -name "*.[eh]rl" -exec sed -i 's,wings/intl_tools/,../intl_tools/,' {} \;
1821 '';
1922
20− buildInputs = [ erlang esdl cl ];
23+ buildInputs = [ erlang cl libGL libGLU ];
2124
2225 # I did not test the *cl* part. I added the -pa just by imitation.
2326 installPhase = ''
2427 mkdir -p $out/bin $out/lib/${name}/ebin
2528 cp ebin/* $out/lib/${name}/ebin
26− cp -R fonts textures shaders plugins $out/lib/$name
29+ cp -R icons textures shaders plugins $out/lib/$name
2730 cat << EOF > $out/bin/wings
2831 #!/bin/sh
29− ${erlang}/bin/erl -smp disable \
30− -pa ${esdl}/lib/erlang/lib/${cl.name}/ebin \
31− -pa ${esdl}/lib/erlang/lib/${esdl.name}/ebin \
32+ ${erlang}/bin/erl \
3233 -pa $out/lib/${name}/ebin -run wings_start start_halt "$@"
3334 EOF
3435 chmod +x $out/bin/wings
pkgs/development/libraries/esdl/default.nixdeleted−32
@@ -1,32 +0,0 @@
1−{stdenv, fetchurl, SDL, libGLU_combined, rebar, erlang}:
2−
3−stdenv.mkDerivation rec {
4− name = "esdl-1.3.1";
5−
6− src = fetchurl {
7− url = "mirror://sourceforge/esdl/${name}.src.tgz";
8− sha256 = "0f5ad519600qarsa2anmnaxh6b7djzx1dnwxzi4l36pxsq896y01";
9− };
10−
11− buildInputs = [ erlang rebar ];
12− propagatedBuildInputs = [ SDL libGLU_combined ];
13−
14− buildPhase = ''
15− rebar compile
16− '';
17−
18− # 'cp' line taken from Arch recipe
19− # https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/erlang-sdl
20− installPhase = ''
21− DIR=$out/lib/erlang/lib/${name}
22− mkdir -p $DIR
23− cp -ruv c_src doc ebin include priv src $DIR
24− '';
25−
26− meta = {
27− homepage = http://esdl.sourceforge.net/;
28− description = "Erlang binding to SDL that includes a binding to OpenGL";
29− license = "BSD";
30− platforms = stdenv.lib.platforms.linux;
31− };
32−}
pkgs/top-level/all-packages.nix+1−4
@@ -9649,8 +9649,6 @@ in
96499649
96509650 epoxy = callPackage ../development/libraries/epoxy {};
96519651
9652− esdl = callPackage ../development/libraries/esdl { };
9653−
96549652 libesmtp = callPackage ../development/libraries/libesmtp { };
96559653
96569654 exiv2 = callPackage ../development/libraries/exiv2 { };
@@ -19953,8 +19951,7 @@ in
1995319951 winswitch = callPackage ../tools/X11/winswitch { };
1995419952
1995519953 wings = callPackage ../applications/graphics/wings {
19956− esdl = esdl.override { erlang = erlangR18; };
19957− erlang = erlangR18;
19954+ erlang = erlangR21;
1995819955 };
1995919956
1996019957 write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { };