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

Commits on Jun 14, 2019

  1. opendune: support ALSA and pulseaudio

    @peterhoeg
    peterhoeg committed Jun 14, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    nolmoonen Nol Moonen
    GPG key ID: 486F753FC25B6289
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9f40ff6 View commit details

Commits on Aug 12, 2019

  1. Merge pull request #63116 from peterhoeg/f/opendune 

    opendune: support ALSA and pulseaudio (move to SDL2)
    @mmahut
    mmahut authored Aug 12, 2019
    Copy the full SHA
    79b28f5 View commit details
Showing with 19 additions and 5 deletions.
  1. +19 −5 pkgs/games/opendune/default.nix
24 changes: 19 additions & 5 deletions pkgs/games/opendune/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, SDL, SDL_image, SDL_mixer }:
{ stdenv, lib, fetchFromGitHub, pkgconfig
, alsaLib, libpulseaudio, SDL2, SDL2_image, SDL2_mixer }:

# - set the opendune configuration at ~/.config/opendune/opendune.ini:
# [opendune]
@@ -16,17 +17,30 @@ stdenv.mkDerivation rec {
sha256 = "15rvrnszdy3db8s0dmb696l4isb3x2cpj7wcl4j09pdi59pc8p37";
};

buildInputs = [ SDL SDL_image SDL_mixer ];
configureFlags = [
"--with-alsa=${lib.getLib alsaLib}/lib/libasound.so"
"--with-pulse=${lib.getLib libpulseaudio}/lib/libpulse.so"
];

nativeBuildInputs = [ pkgconfig ];

buildInputs = [ alsaLib libpulseaudio SDL2 SDL2_image SDL2_mixer ];

enableParallelBuilding = true;

installPhase = ''
install -m 555 -D bin/opendune $out/bin/opendune
runHook preInstall
install -Dm555 -t $out/bin bin/opendune
install -Dm444 -t $out/share/doc/opendune enhancement.txt README.txt
runHook postInstall
'';

meta = with stdenv.lib; {
description = "Dune, Reinvented";
homepage = https://github.com/OpenDUNE/OpenDUNE;
license = licenses.gpl2;
maintainers = [ maintainers.nand0p ];
platforms = platforms.linux;
maintainers = with maintainers; [ nand0p ];
};
}