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

gtkspell3: add valaSupport #43129

Merged
merged 1 commit into from Jul 7, 2018
Merged

gtkspell3: add valaSupport #43129

merged 1 commit into from Jul 7, 2018

Conversation

worldofpeace
Copy link
Contributor

@worldofpeace worldofpeace commented Jul 6, 2018

Motivation for this change

I was packaging elementary-code and it cried about gtkspell3 not having vala support.

cc @jtojnar

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@@ -1,4 +1,4 @@
{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobjectIntrospection}:
{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobjectIntrospection, valaSupport ? true, vala_0_40}:
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's just build it always with vala support, it should be pretty small and go to dev output anyway.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jtojnar Did the thing

configureFlags = [ "--enable-introspection" ];
configureFlags = [
"--enable-introspection"
"--enable-vala=yes"
Copy link
Contributor

Choose a reason for hiding this comment

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

You can get rid of the yes here too.

@@ -11,11 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "09jdicmpipmj4v84gnkqwbmj4lh8v0i6pn967rb9jx4zg2ia9x54";
};

nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection vala_0_40 ];
Copy link
Contributor

Choose a reason for hiding this comment

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

I would just use vala here. It is backwards compatible most of the time and updating every file when new version is released is annoying.

@jtojnar
Copy link
Contributor

jtojnar commented Jul 7, 2018

@GrahamcOfBorg build gtkspell3

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gtkspell3

Partial log (click to expand)

strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/fad7frkbjg2n5by7s3yz050il0nizakk-gtkspell-3.0.9/lib
patching script interpreter paths in /nix/store/fad7frkbjg2n5by7s3yz050il0nizakk-gtkspell-3.0.9
checking for references to /build in /nix/store/fad7frkbjg2n5by7s3yz050il0nizakk-gtkspell-3.0.9...
shrinking RPATHs of ELF executables and libraries in /nix/store/vk0q0klc2yqsp6gq2314gdmd21rkrj65-gtkspell-3.0.9-dev
strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/vk0q0klc2yqsp6gq2314gdmd21rkrj65-gtkspell-3.0.9-dev/lib
patching script interpreter paths in /nix/store/vk0q0klc2yqsp6gq2314gdmd21rkrj65-gtkspell-3.0.9-dev
checking for references to /build in /nix/store/vk0q0klc2yqsp6gq2314gdmd21rkrj65-gtkspell-3.0.9-dev...
/nix/store/fad7frkbjg2n5by7s3yz050il0nizakk-gtkspell-3.0.9

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: gtkspell3

Partial log (click to expand)

/nix/store/m9229b1ff44s36jv3h2196zq7kpvhvlx-gtkspell-3.0.9/lib/libgtkspell3-3.0.dylib: fixing dylib
/nix/store/m9229b1ff44s36jv3h2196zq7kpvhvlx-gtkspell-3.0.9/lib/libgtkspell3-3.0.dylib: fixing dylib
/nix/store/m9229b1ff44s36jv3h2196zq7kpvhvlx-gtkspell-3.0.9/lib/libgtkspell3-3.0.dylib: fixing dylib
/nix/store/m9229b1ff44s36jv3h2196zq7kpvhvlx-gtkspell-3.0.9/lib/libgtkspell3-3.0.dylib: fixing dylib
/nix/store/m9229b1ff44s36jv3h2196zq7kpvhvlx-gtkspell-3.0.9/lib/libgtkspell3-3.0.dylib: fixing dylib
/nix/store/m9229b1ff44s36jv3h2196zq7kpvhvlx-gtkspell-3.0.9/lib/libgtkspell3-3.0.dylib: fixing dylib
strip is /nix/store/7ddbq63v97nk8gkbf7gcsfmby37h6gbl-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/q7sdyksbpzg04vqjz26cs113iasq0c4i-gtkspell-3.0.9-dev/lib
patching script interpreter paths in /nix/store/q7sdyksbpzg04vqjz26cs113iasq0c4i-gtkspell-3.0.9-dev
/nix/store/m9229b1ff44s36jv3h2196zq7kpvhvlx-gtkspell-3.0.9

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: gtkspell3

Partial log (click to expand)

strip is /nix/store/0pjsgkxz0rp5baycq5sp2s72lrr5q9sg-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/9d3fd5yzax32lizp9fsylq51yafv89hh-gtkspell-3.0.9/lib
patching script interpreter paths in /nix/store/9d3fd5yzax32lizp9fsylq51yafv89hh-gtkspell-3.0.9
checking for references to /build in /nix/store/9d3fd5yzax32lizp9fsylq51yafv89hh-gtkspell-3.0.9...
shrinking RPATHs of ELF executables and libraries in /nix/store/661grfz3bnnkl71bbqqfslpakxdy33rg-gtkspell-3.0.9-dev
strip is /nix/store/0pjsgkxz0rp5baycq5sp2s72lrr5q9sg-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/661grfz3bnnkl71bbqqfslpakxdy33rg-gtkspell-3.0.9-dev/lib
patching script interpreter paths in /nix/store/661grfz3bnnkl71bbqqfslpakxdy33rg-gtkspell-3.0.9-dev
checking for references to /build in /nix/store/661grfz3bnnkl71bbqqfslpakxdy33rg-gtkspell-3.0.9-dev...
/nix/store/9d3fd5yzax32lizp9fsylq51yafv89hh-gtkspell-3.0.9

@jtojnar jtojnar merged commit 2cfb6aa into NixOS:master Jul 7, 2018
@worldofpeace worldofpeace deleted the patch-3 branch July 7, 2018 11:17
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