Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5e46d054867f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7cf7fb7948ea
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 6, 2020

  1. svox: 2017-07-18 -> 2018-02-14

    @Mic92
    Mic92 committed Jun 6, 2020
    Copy the full SHA
    99466da View commit details

Commits on Nov 20, 2020

  1. Merge pull request #89638 from Mic92/svox 

    svox: 2017-07-18 -> 2018-02-14
    @Mic92
    Mic92 authored Nov 20, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7cf7fb7 View commit details
Showing with 10 additions and 23 deletions.
  1. +10 −23 pkgs/applications/audio/svox/default.nix
33 changes: 10 additions & 23 deletions pkgs/applications/audio/svox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,24 @@
{ stdenv, fetchgit }:
{ stdenv, fetchFromGitHub, autoreconfHook, popt }:

stdenv.mkDerivation {
pname = "svox";
version = "2017-07-18";
version = "2018-02-14";

src = fetchgit {
url = "https://android.googlesource.com/platform/external/svox";
rev = "7e68d0e9aac1b5d2ad15e92ddaa3bceb27973fcb";
sha256 = "1bqj12w23nn27x64ianm2flrqvkskpvgrnly7ah8gv6k8s8chh3r";
# basically took the source code from android and borrowed autotool patches from debian
src = fetchFromGitHub {
owner = "naggety";
repo = "picotts";
rev = "e3ba46009ee868911fa0b53db672a55f9cc13b1c";
sha256 = "0k3m7vh1ak9gmxd83x29cvhzfkybgz5hnlhd9xj19l1bjyx84s8v";
};

postPatch = ''
cd pico
'';

buildPhase = ''
cd lib
for i in *.c; do
$CC -O2 -fPIC -c -o ''${i%.c}.o $i
done
$CC -shared -o libttspico.so *.o
cd ..
'';

installPhase = ''
install -Dm755 lib/libttspico.so $out/lib/libttspico.so
mkdir -p $out/include
cp lib/*.h $out/include
mkdir -p $out/share/pico/lang
cp lang/*.bin $out/share/pico/lang
'';
buildInputs = [ popt ];

NIX_CFLAGS_COMPILE = "-include stdint.h";
nativeBuildInputs = [ autoreconfHook ];

meta = with stdenv.lib; {
description = "Text-to-speech engine";