Commit 78aa32e7 authored by figsoda's avatar figsoda
Browse files

Revert "dosbox-staging: add meta.changelog"

This reverts commit cb534023.
parent a9237c3a
Loading
Loading
Loading
Loading
+24 −28
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchFromGitHub
, SDL2
, SDL2_image
, SDL2_net
, alsa-lib
{ alsa-lib
, copyDesktopItems
, fetchFromGitHub
, fluidsynth
, glib
, gtest
, irr1
, lib
, libGL
, libGLU
, libjack2
@@ -25,17 +20,22 @@
, ninja
, opusfile
, pkg-config
, irr1
, SDL2
, SDL2_image
, SDL2_net
, speexdsp
, stdenv
}:

stdenv.mkDerivation (self: {
stdenv.mkDerivation rec {
  pname = "dosbox-staging";
  version = "0.80.1";

  src = fetchFromGitHub {
    owner = "dosbox-staging";
    repo = "dosbox-staging";
    rev = "v${self.version}";
    owner = pname;
    repo = pname;
    rev = "v${version}";
    hash = "sha256-I90poBeLSq1c8PXyjrx7/UcbfqFNnnNiXfJdWhLPGMc=";
  };

@@ -49,9 +49,6 @@ stdenv.mkDerivation (self: {
  ];

  buildInputs = [
    SDL2
    SDL2_image
    SDL2_net
    alsa-lib
    fluidsynth
    glib
@@ -66,6 +63,9 @@ stdenv.mkDerivation (self: {
    libslirp
    libsndfile
    opusfile
    SDL2
    SDL2_image
    SDL2_net
    speexdsp
  ];

@@ -91,17 +91,17 @@ stdenv.mkDerivation (self: {
    # original dosbox. Doing it this way allows us to work with frontends and
    # launchers that expect the binary to be named dosbox, but get out of the
    # way of vanilla dosbox if the user desires to install that as well.
    mv $out/bin/dosbox $out/bin/${self.pname}
    mv $out/bin/dosbox $out/bin/${pname}
    makeWrapper $out/bin/dosbox-staging $out/bin/dosbox

    # Create a symlink to dosbox manual instead of merely copying it
    pushd $out/share/man/man1/
    mv dosbox.1.gz ${self.pname}.1.gz
    ln -s ${self.pname}.1.gz dosbox.1.gz
    mv dosbox.1.gz ${pname}.1.gz
    ln -s ${pname}.1.gz dosbox.1.gz
    popd
  '';

  meta = {
  meta = with lib; {
    homepage = "https://dosbox-staging.github.io/";
    description = "A modernized DOS emulator";
    longDescription = ''
@@ -110,14 +110,10 @@ stdenv.mkDerivation (self: {
      existing DOSBox codebase while leveraging modern development tools and
      practices.
    '';
    changelog = "https://github.com/dosbox-staging/dosbox-staging/releases/tag/v${self.version}";
    license = lib.licenses.gpl2Plus;
    maintainers = [
      lib.maintainers.joshuafern
      lib.maintainers.AndersonTorres
    ];
    platforms = lib.platforms.unix;
    license = licenses.gpl2Plus;
    maintainers = with maintainers; [ joshuafern AndersonTorres ];
    platforms = platforms.unix;
    priority = 101;
  };
})
# TODO: report upstream about not finding extra SDL2 libraries
}
# TODO: report upstream about not finding SDL2_net