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

Commits on Oct 25, 2019

  1. gzdoom: 4.2.1 -> 4.2.3

    @Lassulus
    Lassulus committed Oct 25, 2019
    Copy the full SHA
    12b5da2 View commit details

  2. Merge pull request #71973 from Lassulus/gzdoom 

    gzdoom: 4.2.1 -> 4.2.3
    @globin
    globin authored Oct 25, 2019
    Copy the full SHA
    639ca92 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/games/gzdoom/default.nix
6 changes: 3 additions & 3 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 {
pname = "gzdoom";
version = "4.2.1";
version = "4.2.3";

src = fetchFromGitHub {
owner = "coelckers";
repo = "gzdoom";
rev = "g${version}";
sha256 = "1fak8bmsb3jqcx28hr60yj3dd3khzhjw1kgq6q7piwnmgr27ibgd";
sha256 = "06fy4ksn1n745y86s6rlnamkfyqi0894aznf6s56ff6hz2pngsfc";
};

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/mididevices/music_fluidsynth_mididevice.cpp
libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp
'';

installPhase = ''