tachyon: Add support for jpeg, png, more platforms #38119

timokau · 2018-03-30T12:27:52Z

Motivation for this change

Tachyon supports jpeg and png, but those need to be enabled at build time.

I also added some new platforms, I did not test on any platform besides 64 bit linux though. However, since it is supported upstream and I lifted the platform definitions from the (presumably well-tested) sage spkg, there is good reason to believe that they will work.

Pinging maintainer @7c6f434c.

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

7c6f434c · 2018-04-09T06:23:36Z

pkgs/development/libraries/tachyon/enable-jpeg.patch

+-#JPEGLIB= -L/usr/local/lib -ljpeg
+USEJPEG= -DUSEJPEG
+JPEGINC= -I/usr/include
+JPEGLIB= -L/usr/lib -ljpeg


Did you try removing /usr/ mentions? I think we still try to remove things that break non-sandboxed non-NixOS builds if we already touch the corresponding lines.

Very good point, changed.

It would probably be even easier to just re-write the Make-config file entirely instead of patching it, but patching it has the advantage of breaking when upstream changes that file.

I think -ljpeg is still needed, though

I replaced that by setting environment variables in preBuild, which is easier to do conditionally and only requires a single patch.

7c6f434c · 2018-04-09T09:56:31Z

The patch doesn't apply

timokau · 2018-04-09T10:22:32Z

Thats weird, I just retried and it builds fine locally.

Hunk #5 is

-RTVI_HOME = /home/staff/cdtaylor/synergy/REL0.0
-RTVIINC = -I../librtvi
-RTVILIB = -L../librtvi -lrtvictrl.appc -letvi_lib_mcos.appc
+# RTVI_HOME = /home/staff/cdtaylor/synergy/REL0.0
+# RTVIINC = -I../librtvi
+# RTVILIB = -L../librtvi -lrtvictrl.appc -letvi_lib_mcos.appc

It would be nice to see that reject file, can you try to reproduce the failure?

7c6f434c · 2018-04-09T11:17:45Z

Nothing weird: a bump has happenned in the master branch.

timokau · 2018-04-09T11:54:15Z

.. and I just talked about the advantage of the patch breaking when the file changes 😁

I rebased on master.

GrahamcOfBorg · 2018-04-09T12:00:55Z

Success on x86_64-linux (full log)

Attempted: tachyon

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/g38w75zvvvpr112rxgvkk3z639j7zmp2-tachyon-0.99b2
shrinking /nix/store/g38w75zvvvpr112rxgvkk3z639j7zmp2-tachyon-0.99b2/bin/tachyon
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/g38w75zvvvpr112rxgvkk3z639j7zmp2-tachyon-0.99b2/lib  /nix/store/g38w75zvvvpr112rxgvkk3z639j7zmp2-tachyon-0.99b2/bin
patching script interpreter paths in /nix/store/g38w75zvvvpr112rxgvkk3z639j7zmp2-tachyon-0.99b2
/nix/store/gpy3r9ss5ngfkib8ylx7jzgahq7m0x5b-patch-shebangs.sh: line 22: warning: command substitution: ignored null byte in input
/nix/store/gpy3r9ss5ngfkib8ylx7jzgahq7m0x5b-patch-shebangs.sh: line 22: warning: command substitution: ignored null byte in input
checking for references to /tmp/nix-build-tachyon-0.99b2.drv-0 in /nix/store/g38w75zvvvpr112rxgvkk3z639j7zmp2-tachyon-0.99b2...

timokau · 2018-04-09T12:03:16Z

Ah okay I copied the new architectures from the sage spkg, but apparently that also needs a check to the makefile. I'll include that too.

timokau · 2018-04-09T12:25:22Z

(Hopefully) fixed

7c6f434c · 2018-04-09T12:44:14Z

stdenv.isDarwin not just isDarwin

timokau · 2018-04-09T13:42:56Z

Sorry, I thought I tested that change but I must've forgot. Changed.

7c6f434c · 2018-04-09T13:45:22Z

@GrahamcOfBorg build tachyon

GrahamcOfBorg · 2018-04-09T13:46:00Z

Failure on x86_64-darwin (full log)

Attempted: tachyon

Partial log (click to expand)

#include <Carbon/Carbon.h>  /**< Carbon APIs for Multiprocessing */
         ^~~~~~~~~~~~~~~~~
1 error generated.
make[2]: *** [Makefile:278: ../compile/macosx-thr/libtachyon/threads.o] Error 1
make[2]: Leaving directory '/private/tmp/nix-build-tachyon-0.99b2.drv-0/tachyon/unix'
make[1]: *** [Makefile:84: all] Error 2
make[1]: Leaving directory '/private/tmp/nix-build-tachyon-0.99b2.drv-0/tachyon/unix'
make: *** [Make-arch:933: macosx-thr] Error 2
builder for '/nix/store/fipzjraknjwz8zan45mzxrk9v5mf1fbr-tachyon-0.99b2.drv' failed with exit code 2
�[31;1merror:�[0m build of '/nix/store/fipzjraknjwz8zan45mzxrk9v5mf1fbr-tachyon-0.99b2.drv' failed

GrahamcOfBorg · 2018-04-09T13:46:02Z

Success on x86_64-linux (full log)

Attempted: tachyon

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/0sfkl0ik52pnnrlg4ycmklqh798f18qz-tachyon-0.99b2
shrinking /nix/store/0sfkl0ik52pnnrlg4ycmklqh798f18qz-tachyon-0.99b2/bin/tachyon
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/0sfkl0ik52pnnrlg4ycmklqh798f18qz-tachyon-0.99b2/lib  /nix/store/0sfkl0ik52pnnrlg4ycmklqh798f18qz-tachyon-0.99b2/bin
patching script interpreter paths in /nix/store/0sfkl0ik52pnnrlg4ycmklqh798f18qz-tachyon-0.99b2
/nix/store/gpy3r9ss5ngfkib8ylx7jzgahq7m0x5b-patch-shebangs.sh: line 22: warning: command substitution: ignored null byte in input
/nix/store/gpy3r9ss5ngfkib8ylx7jzgahq7m0x5b-patch-shebangs.sh: line 22: warning: command substitution: ignored null byte in input
checking for references to /build in /nix/store/0sfkl0ik52pnnrlg4ycmklqh798f18qz-tachyon-0.99b2...

GrahamcOfBorg · 2018-04-09T13:46:07Z

Success on x86_64-linux (full log)

Attempted: tachyon

Partial log (click to expand)

/nix/store/0sfkl0ik52pnnrlg4ycmklqh798f18qz-tachyon-0.99b2

GrahamcOfBorg · 2018-04-09T13:46:13Z

Success on x86_64-linux (full log)

Attempted: tachyon

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/0sfkl0ik52pnnrlg4ycmklqh798f18qz-tachyon-0.99b2
shrinking /nix/store/0sfkl0ik52pnnrlg4ycmklqh798f18qz-tachyon-0.99b2/bin/tachyon
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/0sfkl0ik52pnnrlg4ycmklqh798f18qz-tachyon-0.99b2/lib  /nix/store/0sfkl0ik52pnnrlg4ycmklqh798f18qz-tachyon-0.99b2/bin
patching script interpreter paths in /nix/store/0sfkl0ik52pnnrlg4ycmklqh798f18qz-tachyon-0.99b2
/nix/store/gpy3r9ss5ngfkib8ylx7jzgahq7m0x5b-patch-shebangs.sh: line 22: warning: command substitution: ignored null byte in input
/nix/store/gpy3r9ss5ngfkib8ylx7jzgahq7m0x5b-patch-shebangs.sh: line 22: warning: command substitution: ignored null byte in input
checking for references to /tmp/nix-build-tachyon-0.99b2.drv-0 in /nix/store/0sfkl0ik52pnnrlg4ycmklqh798f18qz-tachyon-0.99b2...

GrahamcOfBorg · 2018-04-09T13:46:21Z

Failure on x86_64-darwin (full log)

Attempted: tachyon

Partial log (click to expand)

#include <Carbon/Carbon.h>  /**< Carbon APIs for Multiprocessing */
         ^~~~~~~~~~~~~~~~~
1 error generated.
make[2]: *** [Makefile:278: ../compile/macosx-thr/libtachyon/threads.o] Error 1
make[2]: Leaving directory '/private/tmp/nix-build-tachyon-0.99b2.drv-0/tachyon/unix'
make[1]: *** [Makefile:84: all] Error 2
make[1]: Leaving directory '/private/tmp/nix-build-tachyon-0.99b2.drv-0/tachyon/unix'
make: *** [Make-arch:933: macosx-thr] Error 2
builder for '/nix/store/fipzjraknjwz8zan45mzxrk9v5mf1fbr-tachyon-0.99b2.drv' failed with exit code 2
�[31;1merror:�[0m build of '/nix/store/fipzjraknjwz8zan45mzxrk9v5mf1fbr-tachyon-0.99b2.drv' failed

GrahamcOfBorg · 2018-04-09T13:46:24Z

Success on aarch64-linux (full log)

Attempted: tachyon

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/qkb93lp1hasi0g86dll7k3qca8vs9agi-tachyon-0.99b2
shrinking /nix/store/qkb93lp1hasi0g86dll7k3qca8vs9agi-tachyon-0.99b2/bin/tachyon
strip is /nix/store/3zq400fri5dv7d30lpxlqm2v9y1iis6j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/qkb93lp1hasi0g86dll7k3qca8vs9agi-tachyon-0.99b2/lib  /nix/store/qkb93lp1hasi0g86dll7k3qca8vs9agi-tachyon-0.99b2/bin
patching script interpreter paths in /nix/store/qkb93lp1hasi0g86dll7k3qca8vs9agi-tachyon-0.99b2
/nix/store/gpy3r9ss5ngfkib8ylx7jzgahq7m0x5b-patch-shebangs.sh: line 22: warning: command substitution: ignored null byte in input
/nix/store/gpy3r9ss5ngfkib8ylx7jzgahq7m0x5b-patch-shebangs.sh: line 22: warning: command substitution: ignored null byte in input
checking for references to /build in /nix/store/qkb93lp1hasi0g86dll7k3qca8vs9agi-tachyon-0.99b2...
/nix/store/qkb93lp1hasi0g86dll7k3qca8vs9agi-tachyon-0.99b2

GrahamcOfBorg · 2018-04-09T13:46:28Z

Success on aarch64-linux (full log)

Attempted: tachyon

Partial log (click to expand)

these derivations will be built:
  /nix/store/kkf9g73faivwhw7d7dj3r8wmz2lmi2gj-tachyon-0.99b2.drv
waiting for locks or build slots...
/nix/store/qkb93lp1hasi0g86dll7k3qca8vs9agi-tachyon-0.99b2

GrahamcOfBorg · 2018-04-09T13:46:28Z

Success on aarch64-linux (full log)

Attempted: tachyon

Partial log (click to expand)

these derivations will be built:
  /nix/store/kkf9g73faivwhw7d7dj3r8wmz2lmi2gj-tachyon-0.99b2.drv
waiting for locks or build slots...
/nix/store/qkb93lp1hasi0g86dll7k3qca8vs9agi-tachyon-0.99b2

GrahamcOfBorg · 2018-04-09T13:46:31Z

Failure on x86_64-darwin (full log)

Attempted: tachyon

Partial log (click to expand)

#include <Carbon/Carbon.h>  /**< Carbon APIs for Multiprocessing */
         ^~~~~~~~~~~~~~~~~
1 error generated.
make[2]: *** [Makefile:278: ../compile/macosx-thr/libtachyon/threads.o] Error 1
make[2]: Leaving directory '/private/tmp/nix-build-tachyon-0.99b2.drv-0/tachyon/unix'
make[1]: *** [Makefile:84: all] Error 2
make[1]: Leaving directory '/private/tmp/nix-build-tachyon-0.99b2.drv-0/tachyon/unix'
make: *** [Make-arch:933: macosx-thr] Error 2
builder for '/nix/store/fipzjraknjwz8zan45mzxrk9v5mf1fbr-tachyon-0.99b2.drv' failed with exit code 2
�[31;1merror:�[0m build of '/nix/store/fipzjraknjwz8zan45mzxrk9v5mf1fbr-tachyon-0.99b2.drv' failed

7c6f434c · 2018-04-09T13:47:48Z

There goes my attempt to clean up a bit. Anyway: apparently, Carbon did not get added correctly…

timokau · 2018-04-09T13:57:02Z

Any idea why that might be? Otherwise I'll just disable the darwin build for now, at least arm works.

7c6f434c · 2018-04-09T14:00:54Z

Maybe it is plain Carbon.h or Carbon-${crbonVersion}/Carbon/Carbon.h. But without a macOS instance that might be painful to debug…

timokau · 2018-04-09T14:16:44Z

I removed the darwin platform while keeping the relevant patches in place (in case somebody with a mac wants to debug it).

By the way, why is it

platforms = with platforms; linux ++ cygwin;

and not

platforms = with platforms; [ linux cygwin ]

?

7c6f434c · 2018-04-09T14:22:37Z

Because linux and cygwin are already lists, and we want a list, not list-of-lists.

7c6f434c · 2018-04-09T14:24:21Z

@GrahamcOfBorg eval

@GrahamcOfBorg build tachyon

GrahamcOfBorg · 2018-04-09T14:24:46Z

Success on x86_64-linux (full log)

Attempted: tachyon

Partial log (click to expand)

/nix/store/0sfkl0ik52pnnrlg4ycmklqh798f18qz-tachyon-0.99b2

GrahamcOfBorg · 2018-04-09T14:24:50Z

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: tachyon

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-04-09T14:25:06Z

Success on aarch64-linux (full log)

Attempted: tachyon

Partial log (click to expand)

/nix/store/qkb93lp1hasi0g86dll7k3qca8vs9agi-tachyon-0.99b2

timokau · 2018-04-09T14:27:14Z

Ah makes sense.

Thanks!

GrahamcOfBorg added 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Mar 30, 2018

matthewbauer requested a review from 7c6f434c April 9, 2018 02:26

7c6f434c reviewed Apr 9, 2018

View reviewed changes

timokau force-pushed the tachyon-improvements branch from 21f91b3 to a6e608a Compare April 9, 2018 09:06

timokau force-pushed the tachyon-improvements branch from a6e608a to d250e33 Compare April 9, 2018 11:53

timokau force-pushed the tachyon-improvements branch from d250e33 to 327ba49 Compare April 9, 2018 12:25

timokau force-pushed the tachyon-improvements branch from 327ba49 to dcf29c1 Compare April 9, 2018 13:42

NixOS deleted a comment from GrahamcOfBorg Apr 9, 2018

tachyon: Add support for jpeg, png, more platforms

c7acd93

timokau force-pushed the tachyon-improvements branch from dcf29c1 to c7acd93 Compare April 9, 2018 14:05

7c6f434c merged commit b39f539 into NixOS:master Apr 9, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

tachyon: Add support for jpeg, png, more platforms #38119

tachyon: Add support for jpeg, png, more platforms #38119

timokau commented Mar 30, 2018 •

edited

7c6f434c Apr 9, 2018

timokau Apr 9, 2018

7c6f434c Apr 9, 2018

timokau Apr 9, 2018

7c6f434c commented Apr 9, 2018

timokau commented Apr 9, 2018

7c6f434c commented Apr 9, 2018

timokau commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

timokau commented Apr 9, 2018

timokau commented Apr 9, 2018

7c6f434c commented Apr 9, 2018

timokau commented Apr 9, 2018

7c6f434c commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

7c6f434c commented Apr 9, 2018

timokau commented Apr 9, 2018

7c6f434c commented Apr 9, 2018

timokau commented Apr 9, 2018

7c6f434c commented Apr 9, 2018

7c6f434c commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

timokau commented Apr 9, 2018

tachyon: Add support for jpeg, png, more platforms #38119

tachyon: Add support for jpeg, png, more platforms #38119

Conversation

timokau commented Mar 30, 2018 • edited

Motivation for this change

Things done

7c6f434c Apr 9, 2018

Choose a reason for hiding this comment

timokau Apr 9, 2018

Choose a reason for hiding this comment

7c6f434c Apr 9, 2018

Choose a reason for hiding this comment

timokau Apr 9, 2018

Choose a reason for hiding this comment

7c6f434c commented Apr 9, 2018

timokau commented Apr 9, 2018

7c6f434c commented Apr 9, 2018

timokau commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

timokau commented Apr 9, 2018

timokau commented Apr 9, 2018

7c6f434c commented Apr 9, 2018

timokau commented Apr 9, 2018

7c6f434c commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

7c6f434c commented Apr 9, 2018

timokau commented Apr 9, 2018

7c6f434c commented Apr 9, 2018

timokau commented Apr 9, 2018

7c6f434c commented Apr 9, 2018

7c6f434c commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

GrahamcOfBorg commented Apr 9, 2018

timokau commented Apr 9, 2018

timokau commented Mar 30, 2018 •

edited