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

cmst: 2017.03.18 -> 2017.09.19 #32789

Merged
merged 1 commit into from Dec 18, 2017
Merged

cmst: 2017.03.18 -> 2017.09.19 #32789

merged 1 commit into from Dec 18, 2017

Conversation

romildo
Copy link
Contributor

@romildo romildo commented Dec 18, 2017

Motivation for this change

Update to version 2017.09.19

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.

@orivej
Copy link
Contributor

orivej commented Dec 18, 2017

The old postInstall should not be necessary with the current Qt. Could you test my change?

wrapProgram $out/bin/cmst \
--prefix "QTCOMPOSE" ":" "${libX11}/share/X11/locale"
postPatch = ''
for f in cmst.pri \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might want to just patch all files:

  postPatch = ''
    for f in $(find . -name \*.cpp -o -name \*.pri -o -name \*.pro); do
      substituteInPlace $f --replace /etc $out/etc --replace /usr $out
    done
  '';

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@romildo
Copy link
Contributor Author

romildo commented Dec 18, 2017

The old postInstall should not be necessary with the current Qt. Could you test my change?

@orivej It works for me with your change.

@orivej orivej merged commit 89df287 into NixOS:master Dec 18, 2017
@romildo romildo deleted the upd.csmt branch December 18, 2017 17:25
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

4 participants