diff --git a/pkgs/games/doom-ports/doomseeker/add_gitinfo.patch b/pkgs/by-name/do/doomseeker/add_gitinfo.patch similarity index 100% rename from pkgs/games/doom-ports/doomseeker/add_gitinfo.patch rename to pkgs/by-name/do/doomseeker/add_gitinfo.patch diff --git a/pkgs/games/doom-ports/doomseeker/dont_update_gitinfo.patch b/pkgs/by-name/do/doomseeker/dont_update_gitinfo.patch similarity index 100% rename from pkgs/games/doom-ports/doomseeker/dont_update_gitinfo.patch rename to pkgs/by-name/do/doomseeker/dont_update_gitinfo.patch diff --git a/pkgs/games/doom-ports/doomseeker/fix_paths.patch b/pkgs/by-name/do/doomseeker/fix_paths.patch similarity index 100% rename from pkgs/games/doom-ports/doomseeker/fix_paths.patch rename to pkgs/by-name/do/doomseeker/fix_paths.patch diff --git a/pkgs/games/doom-ports/doomseeker/default.nix b/pkgs/by-name/do/doomseeker/package.nix similarity index 83% rename from pkgs/games/doom-ports/doomseeker/default.nix rename to pkgs/by-name/do/doomseeker/package.nix index eb1b4dedce92..476c522b4a87 100644 --- a/pkgs/games/doom-ports/doomseeker/default.nix +++ b/pkgs/by-name/do/doomseeker/package.nix @@ -3,14 +3,11 @@ stdenv, cmake, fetchFromBitbucket, - wrapQtAppsHook, pkg-config, - qtbase, - qttools, - qtmultimedia, zlib, bzip2, xxd, + qt5, }: stdenv.mkDerivation { @@ -31,15 +28,15 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ - wrapQtAppsHook + qt5.wrapQtAppsHook cmake - qttools + qt5.qttools pkg-config xxd ]; buildInputs = [ - qtbase - qtmultimedia + qt5.qtbase + qt5.qtmultimedia zlib bzip2 ]; @@ -52,12 +49,12 @@ stdenv.mkDerivation { ln -s $out/lib/doomseeker/doomseeker $out/bin/ ''; - meta = with lib; { + meta = { homepage = "http://doomseeker.drdteam.org/"; description = "Multiplayer server browser for many Doom source ports"; mainProgram = "doomseeker"; - license = licenses.gpl2Plus; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; maintainers = [ ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47616aeed9d8..8f7f0da94d49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13044,8 +13044,6 @@ with pkgs; ### GAMES/DOOM-PORTS - doomseeker = qt5.callPackage ../games/doom-ports/doomseeker { }; - enyo-launcher = libsForQt5.callPackage ../games/doom-ports/enyo-launcher { }; zandronum = callPackage ../games/doom-ports/zandronum { };