summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2019-05-15 16:10:14 +0200
committertv <tv@krebsco.de>2019-05-15 16:10:14 +0200
commit1ceae8b0e3f37b5d3a4b8ef52621f2959abaab8e (patch)
tree67d182fa8e62f01ed346714c615a64577fae1b66 /makefu/5pkgs
parentdf6007c2eb3c6fab9106c3fc591fded7221b1708 (diff)
parentf541eae020a229b99afe531139be246f8aecb695 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/5pkgs')
-rw-r--r--makefu/5pkgs/default.nix1
-rw-r--r--makefu/5pkgs/pico2wave/default.nix44
-rw-r--r--makefu/5pkgs/prison-break/default.nix6
3 files changed, 48 insertions, 3 deletions
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 1ae10459f..a3c489ccc 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -40,6 +40,7 @@ in {
qcma = super.pkgs.libsForQt5.callPackage ./custom/qcma { };
inherit (callPackage ./devpi {}) devpi-web ;
nodemcu-uploader = super.pkgs.callPackage ./nodemcu-uploader {};
+ prison-break = abort "`prison-break` moved from this namespace to `nur.repos.krebs.prison-break`";
}
// (mapAttrs (_: flip callPackage {})
diff --git a/makefu/5pkgs/pico2wave/default.nix b/makefu/5pkgs/pico2wave/default.nix
new file mode 100644
index 000000000..5302e8bf3
--- /dev/null
+++ b/makefu/5pkgs/pico2wave/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, lib, fetchurl
+, popt
+, libredirect
+, dpkg
+, makeWrapper
+, autoPatchelfHook
+, ...
+}:
+# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=svox-pico-bin
+let
+ pkgrel="8";
+ _arch = "amd64";
+in
+stdenv.mkDerivation rec {
+ name = "pico2wave"; # svox-pico-bin
+ version = "1.0+git20130326";
+ srcs = [
+ (fetchurl { url = "http://mirrors.kernel.org/ubuntu/pool/multiverse/s/svox/libttspico0_${version}-${pkgrel}_${_arch}.deb"; sha256 = "0b8r7r8by5kamnm960bsicimnj1a40ghy3475nzy1jvwj5xgqhrj"; })
+ (fetchurl { url = "http://mirrors.kernel.org/ubuntu/pool/multiverse/s/svox/libttspico-dev_${version}-${pkgrel}_${_arch}.deb"; sha256 = "1knjiwi117h02nbf7k6ll080vl65gxwx3rpj0fq5xkvxbqpjjbvz"; })
+ (fetchurl { url = "http://mirrors.kernel.org/ubuntu/pool/multiverse/s/svox/libttspico-data_${version}-${pkgrel}_all.deb"; sha256 = "0k0x5jh5qzzasrg766pfmls3ksj18wwdbssysvpxkq98aqg4fgmx"; })
+ (fetchurl { url = "http://mirrors.kernel.org/ubuntu/pool/multiverse/s/svox/libttspico-utils_${version}-${pkgrel}_${_arch}.deb"; sha256 = "11yk25fh4n7qz4xjg0dri68ygc3aapj1bk9cvhcwkfvm46j5lrjv"; })
+ ] ;
+
+ nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook ];
+
+ dontBuild = true;
+
+ buildInputs = [ popt ];
+
+ unpackPhase = lib.concatMapStringsSep ";" (src: "dpkg-deb -x ${src} .") srcs;
+
+ installPhase = ''
+ mkdir -p $out
+ cp -r usr/. $out/
+
+ mv $out/lib/*-linux-gnu/* $out/lib/
+ rmdir $out/lib/*-linux-gnu
+
+ wrapProgram "$out/bin/pico2wave" \
+ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+ --set NIX_REDIRECTS /usr/share/pico/lang=$out/share/pico/lang
+ '';
+
+}
diff --git a/makefu/5pkgs/prison-break/default.nix b/makefu/5pkgs/prison-break/default.nix
index 051a46184..672e0b3a0 100644
--- a/makefu/5pkgs/prison-break/default.nix
+++ b/makefu/5pkgs/prison-break/default.nix
@@ -3,12 +3,12 @@ with pkgs.python3.pkgs;
buildPythonPackage rec {
pname = "prison-break";
- version = "1.0.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "makefu";
repo = pname;
- rev = "1.0.0";
- sha256 = "0ab42z6qr42vz4fc077irn9ykrrylagx1dzlw8dqcanf49dxd961";
+ rev = version;
+ sha256 = "07wy6f06vj9s131c16gw1xl1jf9gq5xiqia8awfb26s99gxlv7l9";
};
propagatedBuildInputs = [
docopt