mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 04:49:01 +02:00
Merge master into staging-next
This commit is contained in:
commit
95ee186ccc
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, automoc4
|
||||
, chromaprint
|
||||
, cmake
|
||||
, docbook_xml_dtd_45
|
||||
|
@ -44,7 +43,6 @@ stdenv.mkDerivation rec {
|
|||
wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
automoc4
|
||||
chromaprint
|
||||
ffmpeg
|
||||
flac
|
||||
|
|
86
pkgs/applications/video/hypnotix/default.nix
Normal file
86
pkgs/applications/video/hypnotix/default.nix
Normal file
|
@ -0,0 +1,86 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, cinnamon
|
||||
, gettext
|
||||
, gobject-introspection
|
||||
, mpv
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hypnotix";
|
||||
version = "2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "hypnotix";
|
||||
rev = version;
|
||||
hash = "sha256-9HWr8zjUuhj/GZdrt1WwpwYNLEl34S9IJ7ikGZBSw3s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./libmpv-path.patch;
|
||||
libmpv = "${lib.getLib mpv}/lib/libmpv${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace usr/lib/hypnotix/hypnotix.py \
|
||||
--replace __DEB_VERSION__ ${version} \
|
||||
--replace /usr/share/hypnotix $out/share/hypnotix
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
gobject-introspection
|
||||
python3.pkgs.wrapPython
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
buildInputs = [
|
||||
cinnamon.xapps
|
||||
];
|
||||
|
||||
pythonPath = with python3.pkgs; [
|
||||
imdbpy
|
||||
pygobject3
|
||||
requests
|
||||
setproctitle
|
||||
unidecode
|
||||
xapp
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp -r usr/lib $out
|
||||
cp -r usr/share $out
|
||||
|
||||
glib-compile-schemas $out/share/glib-2.0/schemas
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
makeWrapper ${python3.interpreter} $out/bin/hypnotix \
|
||||
--add-flags $out/lib/hypnotix/hypnotix.py \
|
||||
--prefix PYTHONPATH : "$program_PYTHONPATH" \
|
||||
''${gappsWrapperArgs[@]}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "IPTV streaming application";
|
||||
homepage = "https://github.com/linuxmint/hypnotix";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
18
pkgs/applications/video/hypnotix/libmpv-path.patch
Normal file
18
pkgs/applications/video/hypnotix/libmpv-path.patch
Normal file
|
@ -0,0 +1,18 @@
|
|||
diff --git a/usr/lib/hypnotix/mpv.py b/usr/lib/hypnotix/mpv.py
|
||||
index f42a3be..f1fc40b 100644
|
||||
--- a/usr/lib/hypnotix/mpv.py
|
||||
+++ b/usr/lib/hypnotix/mpv.py
|
||||
@@ -44,12 +44,7 @@ else:
|
||||
# still better than segfaulting, we are setting LC_NUMERIC to "C".
|
||||
locale.setlocale(locale.LC_NUMERIC, 'C')
|
||||
|
||||
- sofile = ctypes.util.find_library('mpv')
|
||||
- if sofile is None:
|
||||
- raise OSError("Cannot find libmpv in the usual places. Depending on your distro, you may try installing an "
|
||||
- "mpv-devel or mpv-libs package. If you have libmpv around but this script can't find it, consult "
|
||||
- "the documentation for ctypes.util.find_library which this script uses to look up the library "
|
||||
- "filename.")
|
||||
+ sofile = '@libmpv@'
|
||||
backend = CDLL(sofile)
|
||||
fs_enc = sys.getfilesystemencoding()
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, cmake, qt4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "automoc4";
|
||||
version = "0.9.88";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/automoc4/0.9.88/${pname}.tar.bz2";
|
||||
sha256 = "0jackvg0bdjg797qlbbyf9syylm0qjs55mllhn11vqjsq3s1ch93";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ qt4 ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://techbase.kde.org/Development/Tools/Automoc4";
|
||||
description = "KDE Meta Object Compiler";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.sander ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
|
@ -87,14 +87,15 @@ in lib.makeExtensible (self: {
|
|||
|
||||
stable = self.nix_2_8;
|
||||
|
||||
# remember to backport updates to the stable branch!
|
||||
unstable = lib.lowPrio (common rec {
|
||||
version = "2.8";
|
||||
suffix = "pre20220512_${lib.substring 0 7 src.rev}";
|
||||
suffix = "pre20220530_${lib.substring 0 7 src.rev}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
rev = "d354fc30b9768ea3dc737a88b57bf5e26d98135b";
|
||||
sha256 = "sha256-wwhezwy3HKeHKJX48ps2qD46f6bL9GDxsFE2QJ+qPHQ=";
|
||||
rev = "af23d38019a47e5bb4cd6585a1678b37c957130c";
|
||||
sha256 = "sha256-RH77Y4IhbTofNYlLQSGKLL0fJAG9iHSwRNvMEZ4M0VQ=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
|
|
@ -90,6 +90,7 @@ mapAliases ({
|
|||
at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22
|
||||
at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22
|
||||
aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26
|
||||
automoc4 = throw "automoc4 has been removed from nixpkgs"; # Added 2022-05-30
|
||||
avldrums-lv2 = x42-avldrums; # Added 2020-03-29
|
||||
avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18
|
||||
awesome-4-0 = awesome; # Added 2022-05-05
|
||||
|
|
|
@ -14926,8 +14926,6 @@ with pkgs;
|
|||
|
||||
automake116x = callPackage ../development/tools/misc/automake/automake-1.16.x.nix { };
|
||||
|
||||
automoc4 = callPackage ../development/tools/misc/automoc4 { };
|
||||
|
||||
avrdude = callPackage ../development/embedded/avrdude { };
|
||||
|
||||
b4 = callPackage ../development/tools/b4 { };
|
||||
|
@ -27101,6 +27099,8 @@ with pkgs;
|
|||
|
||||
hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { };
|
||||
|
||||
hypnotix = callPackage ../applications/video/hypnotix { };
|
||||
|
||||
indigenous-desktop = callPackage ../applications/networking/feedreaders/indigenous-desktop { };
|
||||
|
||||
jackline = callPackage ../applications/networking/instant-messengers/jackline { };
|
||||
|
|
Loading…
Reference in a new issue