diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix deleted file mode 100644 index c1f3f53416fd..000000000000 --- a/pkgs/applications/audio/shortwave/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, cargo -, dbus -, desktop-file-utils -, gdk-pixbuf -, gettext -, gitMinimal -, glib -, gst_all_1 -, gtk4 -, libadwaita -, meson -, ninja -, openssl -, pkg-config -, rustPlatform -, rustc -, sqlite -, wrapGAppsHook4 -, cmake -, libshumate -}: - -stdenv.mkDerivation rec { - pname = "shortwave"; - version = "3.2.0"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "World"; - repo = "Shortwave"; - rev = version; - sha256 = "sha256-ESZ1yD1IuBar8bv83xMczZbtPtHbWRpe2yMVyr7K5gQ="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-8W46bGAitR2YbZbnsigAZMW5pSFTkDAe5JNaNOH5JfA="; - }; - - nativeBuildInputs = [ - desktop-file-utils - gettext - gitMinimal - glib # for glib-compile-schemas - meson - ninja - pkg-config - cargo - rustPlatform.cargoSetupHook - rustc - wrapGAppsHook4 - cmake - ]; - - buildInputs = [ - dbus - gdk-pixbuf - glib - gtk4 - libadwaita - openssl - sqlite - libshumate - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad - ]); - - meta = with lib; { - homepage = "https://gitlab.gnome.org/World/Shortwave"; - description = "Find and listen to internet radio stations"; - mainProgram = "shortwave"; - longDescription = '' - Shortwave is a streaming audio player designed for the GNOME - desktop. It is the successor to the older Gradio application. - ''; - maintainers = with maintainers; [ lasandell ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/sh/shortwave/package.nix b/pkgs/by-name/sh/shortwave/package.nix new file mode 100644 index 000000000000..36eab9d392de --- /dev/null +++ b/pkgs/by-name/sh/shortwave/package.nix @@ -0,0 +1,88 @@ +{ + stdenv, + lib, + fetchFromGitLab, + cargo, + dbus, + desktop-file-utils, + gdk-pixbuf, + gettext, + gitMinimal, + glib, + gst_all_1, + gtk4, + libadwaita, + meson, + ninja, + openssl, + pkg-config, + rustPlatform, + rustc, + sqlite, + wrapGAppsHook4, + libshumate, + libseccomp, + lcms2, +}: + +stdenv.mkDerivation rec { + pname = "shortwave"; + version = "4.0.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "Shortwave"; + rev = version; + sha256 = "sha256-W1eOMyiooDesI13lOze/JcxzhSSxYOW6FOY85NkVyps="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-O5K5aNcWwUYkaJbGzTzS3FdNbEsQsdliyi0YShw+6PU="; + }; + + nativeBuildInputs = [ + desktop-file-utils + gettext + gitMinimal + glib # for glib-compile-schemas + meson + ninja + pkg-config + cargo + rustPlatform.cargoSetupHook + rustc + wrapGAppsHook4 + ]; + + buildInputs = + [ + dbus + gdk-pixbuf + glib + gtk4 + libadwaita + openssl + sqlite + libshumate + libseccomp + lcms2 + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + ]); + + meta = { + homepage = "https://gitlab.gnome.org/World/Shortwave"; + description = "Find and listen to internet radio stations"; + mainProgram = "shortwave"; + maintainers = with lib.maintainers; [ lasandell ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc4f4b0c2b32..f95d4e7cde6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32182,8 +32182,6 @@ with pkgs; shipments = callPackage ../applications/misc/shipments { }; - shortwave = callPackage ../applications/audio/shortwave { }; - shotgun = callPackage ../tools/graphics/shotgun { }; shot-scraper = callPackage ../tools/graphics/shot-scraper { };