Unverified Commit 11e463e0 authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

flightgear: move to by-name, modernize, add maintainer (#453052)

parents 8b0ef133 c4d5904e

pkgs/games/flightgear/default.nix→pkgs/by-name/fl/flightgear/package.nix

+12 −12
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  lib,

  stdenv,

  fetchFromGitLab,

  wrapQtAppsHook,

  callPackage,

  libglut,

  freealut,
@@ -28,9 +27,7 @@ 
  udev,

  fltk13,

  apr,

  qtbase,

  qtquickcontrols2,

  qtdeclarative,

  qt5,

  glew,

  curl,

}:
@@ -71,7 +68,7 @@ stdenv.mkDerivation rec { 


  nativeBuildInputs = [

    cmake

    wrapQtAppsHook

    qt5.wrapQtAppsHook

  ];

  buildInputs = [

    libglut
@@ -98,21 +95,24 @@ stdenv.mkDerivation rec { 
    udev

    fltk13

    apr

    qtbase

    qtquickcontrols2

    qt5.qtbase

    qt5.qtquickcontrols2

    glew

    qtdeclarative

    qt5.qtdeclarative

    curl

  ];



  qtWrapperArgs = [ "--set FG_ROOT ${data}/share/FlightGear" ];



  meta = with lib; {

  meta = {

    description = "Flight simulator";

    maintainers = with maintainers; [ raskin ];

    platforms = platforms.linux;

    maintainers = with lib.maintainers; [

      raskin

      iedame

    ];

    platforms = lib.platforms.linux;

    hydraPlatforms = [ ]; # disabled from hydra because it's so big

    license = licenses.gpl2Plus;

    license = lib.licenses.gpl2Plus;

    mainProgram = "fgfs";

  };

}

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -13314,8 +13314,6 @@ with pkgs; 


  factorio-utils = callPackage ../by-name/fa/factorio/utils.nix { };



  flightgear = libsForQt5.callPackage ../games/flightgear { };



  freeciv = callPackage ../by-name/fr/freeciv/package.nix {

    sdl2Client = false;

    gtkClient = true;