Unverified Commit 2f5cbddb authored by h7x4's avatar h7x4 Committed by GitHub
Browse files

various: migrate pkgs/games to by-name/ (#455402)

parents 593c9b2e cdfda72c

pkgs/games/blightmud/default.nix→pkgs/by-name/bl/blightmud/package.nix

+7 −7
Original line number Diff line number Diff line
@@ -9,14 +9,14 @@ 
  withTTS ? false,

  speechd-minimal,

}:

rustPlatform.buildRustPackage rec {

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "blightmud";

  version = "5.3.1";



  src = fetchFromGitHub {

    owner = "blightmud";

    repo = "blightmud";

    rev = "v${version}";

    rev = "v${finalAttrs.version}";

    hash = "sha256-9GUul5EoejcnCQqq1oX+seBtxttYIUhgcexaZk+7chk=";

  };
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { 
    in

    builtins.concatStringsSep " " (map skipFlag skipList);



  meta = with lib; {

  meta = {

    description = "Terminal MUD client written in Rust";

    mainProgram = "blightmud";

    longDescription = ''
@@ -72,8 +72,8 @@ rustPlatform.buildRustPackage rec { 
      friendly mode.

    '';

    homepage = "https://github.com/Blightmud/Blightmud";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ cpu ];

    platforms = platforms.linux ++ platforms.darwin;

    license = lib.licenses.gpl3Plus;

    maintainers = with lib.maintainers; [ cpu ];

    platforms = with lib.platforms; linux ++ darwin;

  };

}
 
})

pkgs/games/chiaki-ng/default.nix→pkgs/by-name/ch/chiaki-ng/package.nix

+13 −19
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ 
  python3,

  ffmpeg,

  libopus,

  wrapQtAppsHook,

  qtbase,

  qtmultimedia,

  qtsvg,

  qtwayland,

  qtdeclarative,

  qtwebengine,

  SDL2,

  libevdev,

  udev,
@@ -33,6 +26,7 @@ 
  lcms2,

  libdovi,

  xxHash,

  kdePackages,

}:



stdenv.mkDerivation (finalAttrs: {
@@ -42,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { 
  src = fetchFromGitHub {

    owner = "streetpea";

    repo = "chiaki-ng";

    rev = "v${finalAttrs.version}";

    tag = "v${finalAttrs.version}";

    hash = "sha256-7pDQnlElnBkW+Nr6R+NaylZbsGH8dB31nd7jxYD66yQ=";

    fetchSubmodules = true;

  };
@@ -50,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeBuildInputs = [

    cmake

    pkg-config

    wrapQtAppsHook

    kdePackages.wrapQtAppsHook

    protobuf

    python3

    python3.pkgs.wrapPython
@@ -61,12 +55,12 @@ stdenv.mkDerivation (finalAttrs: { 
  buildInputs = [

    ffmpeg

    libopus

    qtbase

    qtmultimedia

    qtsvg

    qtdeclarative

    qtwayland

    qtwebengine

    kdePackages.qtbase

    kdePackages.qtmultimedia

    kdePackages.qtsvg

    kdePackages.qtdeclarative

    kdePackages.qtwayland

    kdePackages.qtwebengine

    protobuf

    SDL2

    curlFull
@@ -108,16 +102,16 @@ stdenv.mkDerivation (finalAttrs: { 
    wrapPythonPrograms

  '';



  meta = with lib; {

  meta = {

    homepage = "https://streetpea.github.io/chiaki-ng/";

    description = "Next-Generation of Chiaki (the open-source remote play client for PlayStation)";

    # Includes OpenSSL linking exception that we currently have no way

    # to represent.

    #

    # See also: <https://github.com/spdx/license-list-XML/issues/939>

    license = licenses.agpl3Only;

    maintainers = with maintainers; [ devusb ];

    platforms = platforms.linux;

    license = lib.licenses.agpl3Only;

    maintainers = with lib.maintainers; [ devusb ];

    platforms = lib.platforms.linux;

    mainProgram = "chiaki";

  };

})

pkgs/games/chiaki/default.nix→pkgs/by-name/ch/chiaki/package.nix

+12 −15
Original line number Diff line number Diff line
@@ -6,24 +6,20 @@ 
  pkg-config,

  ffmpeg,

  libopus,

  mkDerivation,

  qtbase,

  qtmultimedia,

  qtsvg,

  SDL2,

  libevdev,

  udev,

  qtmacextras,

  nanopb,

  libsForQt5,

}:



mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "chiaki";

  version = "2.2.0";



  src = fetchgit {

    url = "https://git.sr.ht/~thestr4ng3r/chiaki";

    rev = "v${version}";

    tag = "v${finalAttrs.version}";

    fetchSubmodules = true;

    hash = "sha256-mLx2ygMlIuDJt9iT4nIj/dcLGjMvvmneKd49L7C3BQk=";

  };
@@ -31,6 +27,7 @@ mkDerivation rec { 
  nativeBuildInputs = [

    cmake

    pkg-config

    libsForQt5.wrapQtAppsHook

  ];



  postPatch = ''
@@ -42,9 +39,9 @@ mkDerivation rec { 
  buildInputs = [

    ffmpeg

    libopus

    qtbase

    qtmultimedia

    qtsvg

    libsForQt5.qtbase

    libsForQt5.qtmultimedia

    libsForQt5.qtsvg

    SDL2

    nanopb

  ]
@@ -53,19 +50,19 @@ mkDerivation rec { 
    udev

  ]

  ++ lib.optionals stdenv.hostPlatform.isDarwin [

    qtmacextras

    libsForQt5.qtmacextras

  ];



  doCheck = true;



  installCheckPhase = "$out/bin/chiaki --help";



  meta = with lib; {

  meta = {

    homepage = "https://git.sr.ht/~thestr4ng3r/chiaki";

    description = "Free and Open Source PlayStation Remote Play Client";

    license = licenses.agpl3Only;

    license = lib.licenses.agpl3Only;

    maintainers = [ ];

    platforms = platforms.all;

    platforms = lib.platforms.all;

    mainProgram = "chiaki";

  };

}
 
})