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: 70204c2ab675
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 78a365448ddc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 2, 2019

  1. gzdoom: Fix wrong fluidsynth version

    @Hodapp87
    Hodapp87 committed Jun 2, 2019
    Copy the full SHA
    cbb4aca View commit details

Commits on Jun 3, 2019

  1. Merge pull request #62538 from Hodapp87/master 

    gzdoom: Fix wrong fluidsynth version
    @Mic92
    Mic92 authored Jun 3, 2019

    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
    78a3654 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/games/gzdoom/default.nix
4 changes: 2 additions & 2 deletions pkgs/games/gzdoom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, makeWrapper
, openal, fluidsynth, soundfont-fluid, libGL, SDL2
, openal, fluidsynth_1, soundfont-fluid, libGL, SDL2
, bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }:

stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [
SDL2 libGL openal fluidsynth bzip2 zlib libjpeg libsndfile mpg123
SDL2 libGL openal fluidsynth_1 bzip2 zlib libjpeg libsndfile mpg123
game-music-emu
];