Skip to content

Commit

Permalink
xdaliclock: Fix aarch64 build
Browse files Browse the repository at this point in the history 
https://hydra.nixos.org/build/65030707
  • Loading branch information
@dezgeg
dezgeg committed Dec 4, 2017
1 parent cb6065f commit e220f31
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkgs/tools/misc/xdaliclock/default.nix
View file
Expand Up @@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb";
};

sourceRoot = "${name}/X11";
# Note: don't change this to set sourceRoot, or updateAutotoolsGnuConfigScriptsHook
# on aarch64 doesn't find the files to patch and the aarch64 build fails!
preConfigure = "cd X11";

buildInputs = [ libX11 xproto libXt libICE libSM libXext ];

Expand Down

3 comments on commit e220f31

@orivej
Copy link
Contributor

@orivej orivej commented on e220f31 Dec 4, 2017

Choose a reason for hiding this comment

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

How does this fix the build? Isn't sourceRoot = "${name}/X11" equivalent to preConfigure = "cd X11"?

@orivej
Copy link
Contributor

@orivej orivej commented on e220f31 Dec 4, 2017

Choose a reason for hiding this comment

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

Ah, you meant that updateAutotoolsGnuConfigScriptsHook should patch a file in the original source root, not in X11.

@dezgeg
Copy link
Contributor Author

@dezgeg dezgeg commented on e220f31 Dec 4, 2017

Choose a reason for hiding this comment

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

Yep.

Please sign in to comment.