eflite: fix build (#344991)

NixOS · Sep 29, 2024 · 939a71c · 939a71c
2 parents 9f2fef7 + 1b2f702
commit 939a71c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/pkgs/applications/audio/eflite/format.patch → pkgs/by-name/ef/eflite/format.patch b/pkgs/applications/audio/eflite/format.patch → pkgs/by-name/ef/eflite/format.patch
diff --git a/pkgs/applications/audio/eflite/default.nix → pkgs/by-name/ef/eflite/package.nix b/pkgs/applications/audio/eflite/default.nix → pkgs/by-name/ef/eflite/package.nix
@@ -1,18 +1,29 @@
-{ lib, stdenv, fetchurl, fetchpatch, flite, alsa-lib, debug ? false }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchpatch,
+  flite,
+  alsa-lib,
+  debug ? false,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "eflite";
   version = "0.4.1";
 
   src = fetchurl {
-    url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${pname}-${version}.tar.gz";
-    sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci";
+    url = "mirror://sourceforge/eflite/eflite/${finalAttrs.version}/eflite-${finalAttrs.version}.tar.gz";
+    hash = "sha256-ka2FhV5Vo/w7l6GlJdtf0dIR1UNCu/yI0QJoExBPFyE=";
   };
 
-  buildInputs = [ flite alsa-lib ];
+  buildInputs = [
+    flite
+    alsa-lib
+  ];
 
   configureFlags = [
-    "flite_dir=${flite}"
+    "flite_dir=${flite.dev}"
     "--with-audio=alsa"
     "--with-vox=cmu_us_kal16"
   ];
@@ -46,7 +57,7 @@ stdenv.mkDerivation rec {
     '';
     license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
     mainProgram = "eflite";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -7175,8 +7175,6 @@ with pkgs;
 
   eff = callPackage ../development/interpreters/eff { };
 
-  eflite = callPackage ../applications/audio/eflite { };
-
   eid-mw = callPackage ../tools/security/eid-mw {
     autoreconfHook = buildPackages.autoreconfHook269;
   };