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

peruse: 1.1 -> 1.2 #21510

Merged
merged 1 commit into from
Jan 8, 2017
Merged

peruse: 1.1 -> 1.2 #21510

merged 1 commit into from
Jan 8, 2017

Conversation

peterhoeg
Copy link
Member

Motivation for this change

peruse: 1.1 -> 1.2

1.2 is the last in the 1.x series as the new version 2.x will depend on kirigami 2.

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
    • Linux
  • 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.

@Mic92
Copy link
Member

Mic92 commented Dec 30, 2016

Does not find its qml file on my system:

$ peruse
The file structure is not set up currectly, and our data is somewhere weird.
Failed to load the component from disk. Reported error was: "file:///nix/store/b76921gyhkrh4adsqc50z3ycrwhaiinn-peruse-1.2/bin/data/peruse/qml/Main.qml:-1 File not found\n"

@peterhoeg
Copy link
Member Author

@Mic92, that's odd, works here. Let me check.

@peterhoeg
Copy link
Member Author

@Mic92, you cannot run the binary directly from there - you need to use the wrapper.

@Mic92
Copy link
Member

Mic92 commented Dec 31, 2016

@peterhoeg which wrapper?

@peterhoeg
Copy link
Member Author

@Mic92, the makeQtWrapper bit creates a wrapper that sets up the correct environment variables in a separate derivation. If you are executing the raw peruse binary directly, it fails with the message you are seeing.

#! /nix/store/hs9zk8bc1w6hc8s8k7hyl5p0sx02l25w-bash-4.3-p46/bin/bash -e
export PATH=$PATH${PATH:+:}/nix/store/jy8yvzf0v7rrnm37hdid64wm3q6ivdmi-peruse-1.2/bin
export XDG_CONFIG_DIRS=/nix/store/jy8yvzf0v7rrnm37hdid64wm3q6ivdmi-peruse-1.2/share${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
export XDG_DATA_DIRS=/nix/store/jy8yvzf0v7rrnm37hdid64wm3q6ivdmi-peruse-1.2/etc/xdg${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
export QML_IMPORT_PATH="/nix/store/jy8yvzf0v7rrnm37hdid64wm3q6ivdmi-peruse-1.2/lib/qt5/imports"
export QML2_IMPORT_PATH="/nix/store/jy8yvzf0v7rrnm37hdid64wm3q6ivdmi-peruse-1.2/lib/qt5/qml"
export QT_PLUGIN_PATH="/nix/store/jy8yvzf0v7rrnm37hdid64wm3q6ivdmi-peruse-1.2/lib/qt5/plugins"
exec -a "$0" /nix/store/3y9398frym576z1p3n6xyx52xnhdbbvk-peruse-1.2/bin/peruse "${extraFlagsArray[@]}" "$@"

@peterhoeg peterhoeg force-pushed the u/peruse branch 2 times, most recently from 2e70964 to caacff8 Compare January 7, 2017 01:04
1.2 also ships Peruse Creator
@Mic92 Mic92 merged commit c302d4a into NixOS:master Jan 8, 2017
@peterhoeg peterhoeg deleted the u/peruse branch January 9, 2017 01:21
@peterhoeg peterhoeg restored the u/peruse branch January 9, 2017 02:23
@peterhoeg peterhoeg deleted the u/peruse branch March 1, 2017 03:12
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.

None yet

3 participants