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: 638fb38ef046
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c0bc3c80c80e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 22, 2017

  1. gzdoom: 2.3.2 -> 3.0.1 

    also change license to gpl3, gzdoom migrated licenses! (yay)
    Cray Elliott authored and Cray Elliott committed May 22, 2017
    Copy the full SHA
    6c7b208 View commit details

  2. eternity-engine: 3.40.46 -> 3.42.02 

    also cleaned up considerably, this was the first nix file I ever wrote!
    Cray Elliott authored and Cray Elliott committed May 22, 2017
    Copy the full SHA
    c0bc3c8 View commit details
Showing with 18 additions and 13 deletions.
  1. +14 −8 pkgs/games/eternity-engine/default.nix
  2. +4 −5 pkgs/games/gzdoom/default.nix
22 changes: 14 additions & 8 deletions pkgs/games/eternity-engine/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
{ stdenv, cmake, mesa, SDL, SDL_mixer, SDL_net, fetchurl }:
{ stdenv, cmake, mesa_noglu, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }:

stdenv.mkDerivation rec {
name = "eternity-engine-3.40.46";
src = fetchurl {
url = https://github.com/team-eternity/eternity/archive/3.40.46.tar.gz;
sha256 = "0jq8q0agw7lgab9q2h8wcaakvg913l9j3a6ss0hn9661plkw2yb4";
name = "eternity-engine-${version}";
version = "3.42.02";
src = fetchFromGitHub {
owner = "team-eternity";
repo = "eternity";
rev = "${version}";
sha256 = "00kpq4k23hjmzjaymw3sdda7mqk8fjq6dzf7fmdal9fm7lfmj41k";
};

buildInputs = [ stdenv cmake mesa SDL SDL_mixer SDL_net ];
nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ mesa_noglu SDL SDL_mixer SDL_net ];

enableParallelBuilding = true;

installPhase = ''
mkdir -p $out/bin
cp source/eternity $out/bin
install -Dm755 source/eternity $out/lib/eternity/eternity
cp -r $src/base $out/lib/eternity/base
mkdir $out/bin
makeWrapper $out/lib/eternity/eternity $out/bin/eternity
'';

meta = {
9 changes: 4 additions & 5 deletions pkgs/games/gzdoom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
name = "gzdoom-${version}";
version = "2.3.2";
version = "3.0.1";

src = fetchFromGitHub {
owner = "coelckers";
repo = "gzdoom";
rev = "g${version}";
sha256 = "1ys7wl4ygvm2lm49qjpql6c5i8gydmbg4f436bcpkywf5srr6xrd";
sha256 = "0s0hl7pa2gr3cm884q7np5naybhv4hqhbfd3s45a8hdf72n6c9cm";
};

nativeBuildInputs = [ cmake makeWrapper ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
sed -i \
-e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \
-e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \
src/sound/music_fluidsynth_mididevice.cpp
src/sound/mididevices/music_fluidsynth_mididevice.cpp
'';

installPhase = ''
@@ -42,8 +42,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://github.com/coelckers/gzdoom";
description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features";
# Doom source license, MAME license
license = licenses.unfreeRedistributable;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ lassulus ];
};