Unverified Commit 12c5a180 authored by Guillaume Girol's avatar Guillaume Girol Committed by GitHub
Browse files

Merge pull request #213856 from Jayman2000/ecwolf-obsolete-build-steps 

ecwolf: remove obsolete build steps & fix executable not being added to `PATH`
parents 1fb588eb d3bb4752

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -6638,6 +6638,12 @@ 
    github = "jayeshbhoot";

    githubId = 1915507;

  };

  jayman2000 = {

    email = "jason@jasonyundt.email";

    github = "Jayman2000";

    githubId = 5579359;

    name = "Jason Yundt";

  };

  jb55 = {

    email = "jb55@jb55.com";

    github = "jb55";

pkgs/games/ecwolf/default.nix

+5 −26
Original line number Diff line number Diff line
@@ -28,43 +28,22 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [ cmake copyDesktopItems pkg-config ];

  buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ];



  desktopItems = [

    (makeDesktopItem {

      name = "ecwolf";

      exec = "ecwolf";

      comment = "Enhanced Wolfenstein 3D port";

      desktopName = "Wolfenstein 3D";

      categories = [ "Game" ];

    })

  ];



  # Change the location where the ecwolf executable looks for the ecwolf.pk3

  # file.

  #

  # By default, it expects the PK3 file to reside in the same directory as the

  # executable, which is not desirable.

  # We will adjust the code so that it can be retrieved from the share/

  # directory.



  preConfigure = ''

    sed -i -e "s|ecwolf.pk3|$out/share/ecwolf/ecwolf.pk3|" src/version.h

  ''

  # Disable app bundle creation on Darwin. It fails, and it is not needed to run it from the Nix store

  + lib.optionalString stdenv.isDarwin ''

  preConfigure = lib.optionalString stdenv.isDarwin ''

    sed -i -e "s|include(\''${CMAKE_CURRENT_SOURCE_DIR}/macosx/install.txt)||" src/CMakeLists.txt

  '';



  # Install the required PK3 file in the required data directory

  # ECWolf installs its binary to the games/ directory, but Nix only adds bin/

  # directories to the PATH.

  postInstall = ''

    mkdir -p $out/share/ecwolf

    cp ecwolf.pk3 $out/share/ecwolf

    mv "$out/games" "$out/bin"

  '';



  meta = with lib; {

    description = "Enhanched SDL-based port of Wolfenstein 3D for various platforms";

    homepage = "https://maniacsvault.net/ecwolf/";

    license = licenses.gpl2Plus;

    maintainers = with maintainers; [ sander ];

    maintainers = with maintainers; [ jayman2000 sander ];

    platforms = platforms.all;

    # On Darwin, the linker fails to find a bunch of symbols.

    broken = stdenv.isDarwin;