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.

Sign up for GitHub

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

Jump to bottom

vte-ng: don't run configure as part of autogen, since it runs w/o args #32910

Merged
merged 1 commit into from
Dec 20, 2017
Merged

vte-ng: don't run configure as part of autogen, since it runs w/o args #32910

merged 1 commit into from
Dec 20, 2017
+1 −1

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Dec 20, 2017

We could alternatively pass arguments here as well,
but there seems little point in running configure twice.

Motivation for this change

#32862 (review)

Which suggests we weren't passing arguments as intended, which this PR fixes.

Haven't confirmed fixes build on Darwin, but... should fix the current failure.

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.

Sorry, something went wrong.

@dtzWill
vte-ng: don't run configure as part of autogen, since it runs w/o args

Verified

This commit was signed with the committer’s verified signature. The key has expired.
holiman Martin HS
GPG key ID: 683B438C05A5DDF0
Expired
Verified
Learn about vigilant mode
d0fc44e 
We could alternatively pass arguments here as well,
but there seems little point in running configure twice.
@jtojnar
Copy link
Member

jtojnar commented Dec 20, 2017

Would not autoreconfHook instead of autoconf automake libtool and modifying preconfigure look better?

@dtzWill
Copy link
Member Author

dtzWill commented Dec 20, 2017

I agree, enough so I assumed existing expression had reason for not doing so? Not sure.

@dtzWill
Copy link
Member Author

dtzWill commented Dec 20, 2017

Hmm, using this:

From 913843c265588c675f0cbb6a04a613bff774c176 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 20 Dec 2017 14:14:59 -0600
Subject: [PATCH] vte-ng: Try using autoreconfHook instead?

---
 pkgs/desktops/gnome-3/core/vte/ng.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/vte/ng.nix b/pkgs/desktops/gnome-3/core/vte/ng.nix
index 73bbba3e72b..632fb87fbc3 100644
--- a/pkgs/desktops/gnome-3/core/vte/ng.nix
+++ b/pkgs/desktops/gnome-3/core/vte/ng.nix
@@ -1,4 +1,4 @@
-{ gnome3, fetchFromGitHub, autoconf, automake, gtk_doc, gettext, libtool, gperf }:
+{ gnome3, fetchFromGitHub, autoreconfHook, autoconf, automake, gtk_doc, gettext, libtool, gperf }:
 
 gnome3.vte.overrideAttrs (oldAttrs: rec {
   name = "vte-ng-${version}";
@@ -11,8 +11,8 @@ gnome3.vte.overrideAttrs (oldAttrs: rec {
     sha256 = "0i6hfzw9sq8521kz0l7lld2km56r0bfp1hw6kxq3j1msb8z8svcf";
   };
 
-  preConfigure = oldAttrs.preConfigure + "; ./autogen.sh";
+  # preConfigure = oldAttrs.preConfigure + "; ./autogen.sh";
 
   nativeBuildInputs = oldAttrs.nativeBuildInputs or []
-    ++ [ gtk_doc autoconf automake gettext libtool gperf ];
+    ++ [ gtk_doc autoreconfHook gperf ];
 })
-- 
2.15.0

results in:

@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking sources
unpacking source archive /nix/store/qr8a3jcpawybydcvng5mxv3wdc207qbg-source
source root is source
@nix { "action": "setPhase", "phase": "patchPhase" }
patching sources
@nix { "action": "setPhase", "phase": "autoreconfPhase" }
autoreconfPhase
autoreconf: Entering directory `.'
autoreconf: configure.ac: not using Gettext
autoreconf: running: aclocal --force -I m4
autoreconf: configure.ac: tracing
autoreconf: running: libtoolize --copy --force
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
autoreconf: running: /nix/store/x6b0mw0m33hhbshlgclxgkliq27lx8rq-autoconf-2.69/bin/autoconf --force
autoreconf: running: /nix/store/x6b0mw0m33hhbshlgclxgkliq27lx8rq-autoconf-2.69/bin/autoheader --force
autoreconf: running: automake --add-missing --copy --force-missing
configure.ac:94: installing './compile'
configure.ac:107: installing './config.guess'
configure.ac:107: installing './config.sub'
configure.ac:16: installing './install-sh'
configure.ac:16: installing './missing'
bindings/vala/Makefile.am: installing './depcomp'
automake: error: cannot open < gtk-doc.make: No such file or directory
autoreconf: automake failed with exit status: 1

@jtojnar
Copy link
Member

jtojnar commented Dec 20, 2017

That's weird. Where gtk-doc.make does come from when not using autoreconfHook?

@dtzWill
Copy link
Member Author

dtzWill commented Dec 20, 2017

FWIW bit of historical context from git history: 45bf783

Hmm, autogen.sh runs gtkdocize --copy --flavour no-tmpl.

I don't see a good way to do this ourselves, I vote using approach currently in the PR.

@jtojnar
Copy link
Member

jtojnar commented Dec 20, 2017

@GrahamcOfBorg build termite

GrahamcOfBorg
GrahamcOfBorg reviewed Dec 20, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-darwin

termite.cc:348:5: error: use of undeclared identifier 'errno'
    errno = 0;
    ^
termite.cc:350:10: error: use of undeclared identifier 'errno'
    if (!errno && id && id <= info->url_list.size() && !*end) {
         ^
2 errors generated.
make: *** [Makefile:36: termite] Error 1
builder for ‘/nix/store/k55y3bhn16nc4725xam54xnd760jzxcd-termite-13.drv’ failed with exit code 2
error: build of ‘/nix/store/k55y3bhn16nc4725xam54xnd760jzxcd-termite-13.drv’ failed

@jtojnar
Copy link
Member

jtojnar commented Dec 20, 2017

I guess it is fine. Thanks.

GrahamcOfBorg
GrahamcOfBorg reviewed Dec 20, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

shrinking RPATHs of ELF executables and libraries in /nix/store/rbck0i7m0l7hy5q561i9a38xl7x3aici-termite-13
shrinking /nix/store/rbck0i7m0l7hy5q561i9a38xl7x3aici-termite-13/bin/.termite-wrapped
gzipping man pages under /nix/store/rbck0i7m0l7hy5q561i9a38xl7x3aici-termite-13/share/man/
stripping (with flags -S) in /nix/store/rbck0i7m0l7hy5q561i9a38xl7x3aici-termite-13/bin 
patching script interpreter paths in /nix/store/rbck0i7m0l7hy5q561i9a38xl7x3aici-termite-13
checking for references to /tmp/nix-build-termite-13.drv-0 in /nix/store/rbck0i7m0l7hy5q561i9a38xl7x3aici-termite-13...
shrinking RPATHs of ELF executables and libraries in /nix/store/ffl2f66b08i3ry5vkrxvzgqxaaj7g8dc-termite-13-terminfo
patching script interpreter paths in /nix/store/ffl2f66b08i3ry5vkrxvzgqxaaj7g8dc-termite-13-terminfo
checking for references to /tmp/nix-build-termite-13.drv-0 in /nix/store/ffl2f66b08i3ry5vkrxvzgqxaaj7g8dc-termite-13-terminfo...
/nix/store/rbck0i7m0l7hy5q561i9a38xl7x3aici-termite-13

@jtojnar jtojnar merged commit 92e525e into NixOS:master Dec 20, 2017
GrahamcOfBorg
GrahamcOfBorg reviewed Dec 20, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: aarch64-linux

shrinking RPATHs of ELF executables and libraries in /nix/store/z1fr1zdkxqi5vvcpb43czv0rfcfingf0-termite-13
shrinking /nix/store/z1fr1zdkxqi5vvcpb43czv0rfcfingf0-termite-13/bin/.termite-wrapped
gzipping man pages under /nix/store/z1fr1zdkxqi5vvcpb43czv0rfcfingf0-termite-13/share/man/
stripping (with flags -S) in /nix/store/z1fr1zdkxqi5vvcpb43czv0rfcfingf0-termite-13/bin
patching script interpreter paths in /nix/store/z1fr1zdkxqi5vvcpb43czv0rfcfingf0-termite-13
checking for references to /build in /nix/store/z1fr1zdkxqi5vvcpb43czv0rfcfingf0-termite-13...
shrinking RPATHs of ELF executables and libraries in /nix/store/0bw5c4waafv63k7i2kvddrj992v4dz2g-termite-13-terminfo
patching script interpreter paths in /nix/store/0bw5c4waafv63k7i2kvddrj992v4dz2g-termite-13-terminfo
checking for references to /build in /nix/store/0bw5c4waafv63k7i2kvddrj992v4dz2g-termite-13-terminfo...
/nix/store/z1fr1zdkxqi5vvcpb43czv0rfcfingf0-termite-13

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GrahamcOfBorg GrahamcOfBorg

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dtzWill @jtojnar @GrahamcOfBorg