Skip to content

Commit

Permalink
Merge #36680: apvlv: fix build with gcc7
Browse files Browse the repository at this point in the history
  • Loading branch information
@vcunat
vcunat committed Mar 9, 2018
2 parents 0ce2f04 + de93488 commit 922d55a
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions pkgs/applications/misc/apvlv/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/naihe2010/apvlv/commit/4c7a583e8431964def482e5471f02e6de8e62a7b.patch";
sha256 = "1dszm120lwm90hcg5zmd4vr6pjyaxc84qmb7k0fr59mmb3qif62j";
})
# fix build with gcc7
(fetchpatch {
url = "https://github.com/naihe2010/apvlv/commit/a3a895772a27d76dab0c37643f0f4c73f9970e62.patch";
sha256 = "1fpc7wr1ajilvwi5gjsy5g9jcx4bl03gp5dmajg90ljqbhwz2bfi";
})
];

installPhase = ''
Expand Down

4 comments on commit 922d55a

@matthewbauer
Copy link
Member

Choose a reason for hiding this comment

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

Heads up that "platforms" is set to linux now. (was unix previously). It should probably be switched back.

@vcunat
Copy link
Member Author

@vcunat vcunat commented on 922d55a Mar 10, 2018

Choose a reason for hiding this comment

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

I don't understand what you mean. This PR fixed build on Linux; I haven't noticed mention of any other platform.

@matthewbauer
Copy link
Member

Choose a reason for hiding this comment

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

Oh sorry I thought it fixed Darwin builds.

@vcunat
Copy link
Member Author

@vcunat vcunat commented on 922d55a Mar 10, 2018

Choose a reason for hiding this comment

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

No, I don't think so; gcc is rarely used in Darwin builds AFAIK.

Please sign in to comment.