cool-retro-term: fix on darwin #51830
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GrahamcOfBorg
added
6.topic: darwin
c0bw3b
reviewed
Dec 11, 2018
c0bw3b
reviewed
Dec 11, 2018
c0bw3b
reviewed
Dec 11, 2018
c0bw3b
reviewed
Dec 11, 2018
c0bw3b
reviewed
Dec 11, 2018
| @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { | |||
| src = fetchFromGitHub { | |||
| repo = "qmltermwidget"; | |||
| owner = "Swordfish90"; | |||
| rev = "v${version}"; | |||
| sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3"; | |||
| rev = "48274c75660e28d44af7c195e79accdf1bd44963"; | |||
There was a problem hiding this comment.
Was #51572 not enough to fix Darwin build of qmltermwidget ?
There was a problem hiding this comment.
Unfortunately not- #51572 fixes the build, but there is another issue once it's running- Swordfish90/cool-retro-term#366
georgewhewell
force-pushed
the
cool-retro-term-fix-darwin
branch
from
2b6df8c
to
b77bcdb
Compare
Mic92
reviewed
Dec 12, 2018
| wrapProgram $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term \ | ||
| --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms \ | ||
| --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix} \ | ||
| --set QML2_IMPORT_PATH ${qmltermwidget}/${qtbase.qtQmlPrefix}:${qtdeclarative.bin}/${qtbase.qtQmlPrefix}:${qtgraphicaleffects}/${qtbase.qtQmlPrefix}:${qtquickcontrols}/${qtbase.qtQmlPrefix} |
There was a problem hiding this comment.
Is this also the case if you install retro-term in your nix profile?
There was a problem hiding this comment.
Oh, that works! Also works without wrapper using nix run. I have removed the wrapper, it seems like all that is needed is symlink to binary.
georgewhewell
force-pushed
the
cool-retro-term-fix-darwin
branch
from
b77bcdb
to
7f82302
Compare
alyssais
reviewed
Dec 12, 2018
| @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { | |||
| src = fetchFromGitHub { | |||
| repo = "qmltermwidget"; | |||
| owner = "Swordfish90"; | |||
| rev = "v${version}"; | |||
| sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3"; | |||
| rev = "48274c75660e28d44af7c195e79accdf1bd44963"; | |||
There was a problem hiding this comment.
version should be changed to 2018-11-24 and name to qmltermwidget-unstable-${version} per https://nixos.org/nixpkgs/manual/#sec-package-naming.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
cool-retro-term had two problems on darwin:
$PATHdue to macOS packagingadd a symlink to the macOS binary on darwin and update qmltermwidget makes it work
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)