Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ccf92d9702ae
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d2891652c551
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 10, 2020

  1. chocolate-doom: 2.3.0 -> 3.0.0 

    (cherry picked from commit 134f200)
    @AXDOOMER
    AXDOOMER authored and Cray Elliott committed Jul 10, 2020
    Copy the full SHA
    af92d30 View commit details

  2. chocolateDoom: 3.0.0 -> 3.0.1 

    (cherry picked from commit ea7fc40)
    @r-ryantm
    r-ryantm authored and Cray Elliott committed Jul 10, 2020
    Copy the full SHA
    d289165 View commit details
Showing with 13 additions and 8 deletions.
  1. +13 −8 pkgs/games/chocolate-doom/default.nix
21 changes: 13 additions & 8 deletions pkgs/games/chocolate-doom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
{ stdenv, autoreconfHook, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }:
{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }:

stdenv.mkDerivation rec {
name = "chocolate-doom-2.3.0";
src = fetchurl {
url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz";
sha256 = "0i57smxmbhxj0wgvxq845ba9zsn5nx5wmzkl71rdchyd4q5jmida";
pname = "chocolate-doom";
version = "3.0.1";

src = fetchFromGitHub {
owner = "chocolate-doom";
repo = pname;
rev = "${pname}-${version}";
sha256 = "1zlcqhd49c5n8vaahgaqrc2y10z86xng51sbd82xm3rk2dly25jp";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ SDL SDL_mixer SDL_net ];
patchPhase = ''

postPatch = ''
sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am
'';

nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ SDL2 SDL2_mixer SDL2_net ];
enableParallelBuilding = true;

meta = {