Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

flashplayer: cleanup, use archive as a source #11675

Merged
merged 1 commit into from
Dec 14, 2015

Conversation

abbradar
Copy link
Member

Most work done by @ericsagnes. Followup on #11571. (EDIT: was #11588)

@mention-bot
Copy link

By analyzing the blame information on this pull request, we identified @7c6f434c, @vcunat and @edolstra to be potential reviewers

@ktosiek
Copy link
Contributor

ktosiek commented Dec 13, 2015

The patch works for me. I was bitten by those missing files quite a few times already.

@ericsagnes
Copy link
Contributor

Thanks for making the PR!

edolstra added a commit that referenced this pull request Dec 14, 2015
flashplayer: cleanup, use archive as a source
@edolstra edolstra merged commit 1ae8f0f into NixOS:master Dec 14, 2015
@vcunat
Copy link
Member

vcunat commented Dec 17, 2015

The pushed commit makes flash fail to build on i686-linux. The problem is that the flash-plugin*.tar.gz glob doesn't work there, as shown by the following log with added ls -l commands.

building path(s) ‘/nix/store/fs4gpgdrvfz94ic92zafxxzmyryqi9kp-flashplayer-11.2.202.554’
unpacking sources
unpacking source archive /nix/store/ynn9xn3sa4zhak3yp9vrsrpwz41g129y-fp_11.2.202.554_archive.zip
source root is .
total 12
-rw-r--r-- 1 nixbld nixbld 4896 Dec 17 11:11 env-vars
drwxr-xr-x 5 nixbld nixbld 4096 Dec 17 11:11 fp_11.2.202.554_archive
total 12656
-rw-rw-rw- 1 nixbld nixbld 6963199 Dec  1 08:05 flashplayer_11_2r202_554_linux.i386.tar.gz
-rw-rw-rw- 1 nixbld nixbld 5992629 Dec  1 08:05 flashplayer_11_2r202_554_linux_sa.i386.tar.gz
tar: option requires an argument -- 'f'
Try 'tar --help' or 'tar --usage' for more information.

@abbradar
Copy link
Member Author

Argh, so we have (in different places) 32bit and 64bit, i386 and x86_64, flash-plugin and flashplayer and geez, even their naming conventions are completely different!

I'll look at this.

EDIT: Sigh, don't forget also 11_2r202_554 and 11.2.202.554.

@abbradar
Copy link
Member Author

Fixed at 8c17707

@vcunat
Copy link
Member

vcunat commented Dec 17, 2015

OK. Now I finished picking all flash changes to release-15.09 to keep the security updates easier.

@abbradar
Copy link
Member Author

Nice, thanks!

@vcunat
Copy link
Member

vcunat commented Dec 17, 2015

Thanks, too :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants