diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-09-27 02:45:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-27 02:45:18 +0200 |
| commit | d91ace08518a6a262652b6a3fdae321aeadf98ab (patch) | |
| tree | 7337c275964c1394afef7090e42feb5642e2bd41 | |
| parent | 7c5794427fb225ce16ff3af590bf48747eae0837 (diff) | |
| parent | 735a134c88ff23f979c900cb0aa04579a705c4b0 (diff) | |
dablin: cleanups, move to pkgs/by-name (#344742)
| -rw-r--r-- | pkgs/applications/radio/dablin/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/by-name/da/dablin/package.nix | 48 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 48 insertions, 30 deletions
diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix deleted file mode 100644 index 5ccce0a2dc369..0000000000000 --- a/pkgs/applications/radio/dablin/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, mpg123, SDL2, gtkmm3, faad2, pcre -} : - -stdenv.mkDerivation rec { - pname = "dablin"; - version = "1.16.0"; - - src = fetchFromGitHub { - owner = "Opendigitalradio"; - repo = "dablin"; - rev = version; - sha256 = "sha256-1rjL0dSEgF7FF72KiT6Tyj7/wbRc24LzyzmM1IGdglc="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ faad2 mpg123 SDL2 gtkmm3 pcre ]; - - meta = with lib; { - description = "Play DAB/DAB+ from ETI-NI aligned stream"; - homepage = "https://github.com/Opendigitalradio/dablin"; - license = with licenses; [ gpl3 lgpl21 ]; - platforms = platforms.linux; - maintainers = [ maintainers.markuskowa ]; - }; -} - diff --git a/pkgs/by-name/da/dablin/package.nix b/pkgs/by-name/da/dablin/package.nix new file mode 100644 index 0000000000000..a86a6d505721e --- /dev/null +++ b/pkgs/by-name/da/dablin/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + mpg123, + SDL2, + gtkmm3, + faad2, + pcre, +}: + +stdenv.mkDerivation rec { + pname = "dablin"; + version = "1.16.0"; + + src = fetchFromGitHub { + owner = "Opendigitalradio"; + repo = "dablin"; + rev = version; + sha256 = "sha256-1rjL0dSEgF7FF72KiT6Tyj7/wbRc24LzyzmM1IGdglc="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + faad2 + mpg123 + SDL2 + gtkmm3 + pcre + ]; + + meta = { + description = "Play DAB/DAB+ from ETI-NI aligned stream"; + homepage = "https://github.com/Opendigitalradio/dablin"; + license = with lib.licenses; [ + gpl3Plus + lgpl21Only + ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.markuskowa ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 565fab148e84c..1d0442b154068 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28940,8 +28940,6 @@ with pkgs; cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; - dablin = callPackage ../applications/radio/dablin { }; - daktilo = callPackage ../tools/misc/daktilo { }; darcs = haskell.lib.compose.disableCabalFlag "library" |