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: 836e4b71c4aa
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4528f9dbfb3e
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 10, 2020

  1. pingus: 0.7.6 -> unstable; fixes build conflicts with dependency updates 

    (cherry picked from commit 35a2f79)
    @7c6f434c @woffs
    7c6f434c authored and woffs committed Apr 10, 2020
    Copy the full SHA
    a633701 View commit details

  2. pingus: move cmake to nativeBuildInputs 

    (cherry picked from commit de6a28d)
    @woffs
    woffs committed Apr 10, 2020
    Copy the full SHA
    e8ae534 View commit details

Commits on Apr 11, 2020

  1. Merge pull request #84918 from woffs/backport-pingus-83706-20.03 

    [nixos-20.03] pingus: 0.7.6 -> unstable
    @7c6f434c
    7c6f434c authored Apr 11, 2020

    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
    4528f9d View commit details
Showing with 14 additions and 30 deletions.
  1. +14 −29 pkgs/games/pingus/default.nix
  2. +0 −1 pkgs/games/pingus/default.upstream
43 changes: 14 additions & 29 deletions pkgs/games/pingus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,19 @@
{stdenv, fetchurl, fetchpatch, scons, SDL, SDL_image, boost, libpng, SDL_mixer
, pkgconfig, libGLU, libGL}:
let
s = # Generated upstream information
{
baseName="pingus";
version="0.7.6";
name="pingus-0.7.6";
hash="0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m";
url="http://pingus.googlecode.com/files/pingus-0.7.6.tar.bz2";
sha256="0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m";
{stdenv, fetchgit, cmake, SDL2, SDL2_image, boost, libpng, SDL2_mixer
, pkgconfig, libGLU, libGL, git, jsoncpp }:
stdenv.mkDerivation rec {
pname = "pingus";
version = "unstable-0.7.6.0.20191104";

nativeBuildInputs = [ cmake pkgconfig git ];
buildInputs = [ SDL2 SDL2_image boost libpng SDL2_mixer libGLU libGL jsoncpp ];
src = fetchgit {
url = "https://gitlab.com/pingus/pingus/";
rev = "709546d9b9c4d6d5f45fc9112b45ac10c7f9417d";
sha256 = "sha256:11mmzk0766riaw5qyd1r5i7s7vczbbzfccm92bvgrm99iy1sj022";
fetchSubmodules = true;
};
in
stdenv.mkDerivation {
inherit (s) name version;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [scons SDL SDL_image boost libpng SDL_mixer libGLU libGL];
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=${placeholder "out"}" ];
dontUseSconsInstall = true;

meta = {
inherit (s) version;
description = ''A puzzle game with mechanics similar to Lemmings'';
platforms = stdenv.lib.platforms.linux;
maintainers = [stdenv.lib.maintainers.raskin];
1 change: 0 additions & 1 deletion pkgs/games/pingus/default.upstream
View file

This file was deleted.