diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix deleted file mode 100644 index 6e71d34ff27b..000000000000 --- a/pkgs/applications/audio/gbsplay/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, libpulseaudio, nas }: - -stdenv.mkDerivation rec { - pname = "gbsplay"; - version = "0.0.97"; - - src = fetchFromGitHub { - owner = "mmitch"; - repo = "gbsplay"; - rev = version; - sha256 = "sha256-O4t5OzXcrGoxzSXr0nzc01bItjcp1LvFeWnbdSUDwFU="; - }; - - configureFlags = [ - "--without-test" # See mmitch/gbsplay#62 - "--without-contrib" - ]; - - nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ libpulseaudio nas ]; - - postInstall = '' - installShellCompletion --bash --name gbsplay contrib/gbsplay.bashcompletion - ''; - - meta = with lib; { - description = "Gameboy sound player"; - license = licenses.gpl1Plus; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ sigmanificient ]; - }; -} diff --git a/pkgs/by-name/gb/gbsplay/package.nix b/pkgs/by-name/gb/gbsplay/package.nix new file mode 100644 index 000000000000..64df774af5c2 --- /dev/null +++ b/pkgs/by-name/gb/gbsplay/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + installShellFiles, + libpulseaudio, + nas, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gbsplay"; + version = "0.0.97"; + + src = fetchFromGitHub { + owner = "mmitch"; + repo = "gbsplay"; + rev = finalAttrs.version; + hash = "sha256-O4t5OzXcrGoxzSXr0nzc01bItjcp1LvFeWnbdSUDwFU="; + }; + + configureFlags = [ + "--without-test" # See mmitch/gbsplay#62 + "--without-contrib" + ]; + + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ + libpulseaudio + nas + ]; + + postInstall = '' + installShellCompletion --bash --name gbsplay contrib/gbsplay.bashcompletion + ''; + + meta = { + description = "Gameboy sound player"; + license = lib.licenses.gpl1Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "gbsplay"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70c7e48a82bb..3fbad0001f2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5346,8 +5346,6 @@ with pkgs; gb-backup = callPackage ../tools/backup/gamerbackup { }; - gbsplay = callPackage ../applications/audio/gbsplay { }; - gdrive = callPackage ../applications/networking/gdrive { }; gdrive3 = callPackage ../applications/networking/gdrive3 { };