Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5687a38cb00e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fa8e61d1184d
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 14, 2018

  1. pingus: fix build with gcc7 

    (cherry picked from commit 2dfeb6f)
    @pbogdan @7c6f434c
    pbogdan authored and 7c6f434c committed Mar 14, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fa8e61d View commit details
Showing with 9 additions and 2 deletions.
  1. +9 −2 pkgs/games/pingus/default.nix
11 changes: 9 additions & 2 deletions pkgs/games/pingus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig
, libGLU_combined}:
{stdenv, fetchurl, fetchpatch, scons, SDL, SDL_image, boost, libpng, SDL_mixer
, pkgconfig, libGLU_combined}:
let
s = # Generated upstream information
rec {
@@ -18,6 +18,13 @@ stdenv.mkDerivation rec {
src = fetchurl {
inherit (s) url sha256;
};
patches = [
# fix build with gcc7
(fetchpatch {
url = https://github.com/Pingus/pingus/commit/df6e2f445d3e2925a94d22faeb17be9444513e92.patch;
sha256 = "0nqyhznnnvpgfa6rfv8rapjfpw99b67n97jfqp9r3hpib1b3ja6p";
})
];
makeFlags = '' PREFIX="$(out)" '';
meta = {
inherit (s) version;