diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2018-12-31 16:20:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-31 16:20:02 +0100 |
commit | ced0be5c06be5e240b4e7196b2563c918d0cb396 (patch) | |
tree | 07e98d7c70bb9081234980e15ac7c3dbdf030861 /pkgs/applications/graphics | |
parent | 8252eb91510e690e6c410ef44b1f4e8c2095657d (diff) | |
parent | c65e727236e9222c49cc0eb8b157c0352190657d (diff) | |
download | nixlib-ced0be5c06be5e240b4e7196b2563c918d0cb396.tar nixlib-ced0be5c06be5e240b4e7196b2563c918d0cb396.tar.gz nixlib-ced0be5c06be5e240b4e7196b2563c918d0cb396.tar.bz2 nixlib-ced0be5c06be5e240b4e7196b2563c918d0cb396.tar.lz nixlib-ced0be5c06be5e240b4e7196b2563c918d0cb396.tar.xz nixlib-ced0be5c06be5e240b4e7196b2563c918d0cb396.tar.zst nixlib-ced0be5c06be5e240b4e7196b2563c918d0cb396.zip |
Merge pull request #53078 from tex/wings3d
wings3d: 1.5.4 -> 2.2.1
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/wings/default.nix | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index 9ecf94e21c01..ed3220d2bf96 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -1,34 +1,35 @@ -{ fetchurl, stdenv, erlang, esdl, cl }: +{ fetchurl, stdenv, erlang, cl, libGL, libGLU }: stdenv.mkDerivation rec { - name = "wings-1.5.4"; + name = "wings-2.2.1"; src = fetchurl { url = "mirror://sourceforge/wings/${name}.tar.bz2"; - sha256 = "0qz6rmmkqgk3p0d3v2ikkf22n511bq0m7xp3kkradwrp28fcl15x"; + sha256 = "1adlq3wd9bz0hjznpzsgilxgsbhr0kk01f06872mq37v4cbw76bh"; }; - ERL_LIBS = "${esdl}/lib/erlang/lib:${cl}/lib/erlang/lib"; + ERL_LIBS = "${cl}/lib/erlang/lib"; patchPhase = '' - sed -i 's,include("sdl_keyboard.hrl"),include_lib("esdl/include/sdl_keyboard.hrl"),' \ - src/wings_body.erl plugins_src/commands/wpc_constraints.erl - - # Fix reference - sed -i 's,wings/e3d/,,' plugins_src/import_export/wpc_lwo.erl + sed -i 's,-Werror ,,' e3d/Makefile + sed -i 's,../../wings/,../,' icons/Makefile + find plugins_src -mindepth 2 -type f -name "*.[eh]rl" -exec sed -i 's,wings/src/,../../src/,' {} \; + find plugins_src -mindepth 2 -type f -name "*.[eh]rl" -exec sed -i 's,wings/e3d/,../../e3d/,' {} \; + find plugins_src -mindepth 2 -type f -name "*.[eh]rl" -exec sed -i 's,wings/intl_tools/,../../intl_tools/,' {} \; + find . -type f -name "*.[eh]rl" -exec sed -i 's,wings/src/,../src/,' {} \; + find . -type f -name "*.[eh]rl" -exec sed -i 's,wings/e3d/,../e3d/,' {} \; + find . -type f -name "*.[eh]rl" -exec sed -i 's,wings/intl_tools/,../intl_tools/,' {} \; ''; - buildInputs = [ erlang esdl cl ]; + buildInputs = [ erlang cl libGL libGLU ]; # I did not test the *cl* part. I added the -pa just by imitation. installPhase = '' mkdir -p $out/bin $out/lib/${name}/ebin cp ebin/* $out/lib/${name}/ebin - cp -R fonts textures shaders plugins $out/lib/$name + cp -R textures shaders plugins $out/lib/$name cat << EOF > $out/bin/wings #!/bin/sh - ${erlang}/bin/erl -smp disable \ - -pa ${esdl}/lib/erlang/lib/${cl.name}/ebin \ - -pa ${esdl}/lib/erlang/lib/${esdl.name}/ebin \ + ${erlang}/bin/erl \ -pa $out/lib/${name}/ebin -run wings_start start_halt "$@" EOF chmod +x $out/bin/wings |