mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-29 00:27:49 +03:00
Merge pull request #299760 from onny/onthespot-update
onthespot: Fix build issue; python3Packages.pyogg: 0.6.9a1 > 0.6.14a1
This commit is contained in:
commit
b104180d5b
@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, makeDesktopItem
|
||||
, python3
|
||||
, wrapQtAppsHook
|
||||
, libsForQt5
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
copyDesktopItems
|
||||
pythonRelaxDepsHook
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
@ -32,7 +32,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
packaging
|
||||
pillow
|
||||
protobuf
|
||||
pyogg
|
||||
pyqt5
|
||||
pyqt5-sip
|
||||
pyxdg
|
||||
@ -46,6 +45,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pythonRemoveDeps = [
|
||||
"PyQt5-Qt5"
|
||||
"PyQt5-stubs"
|
||||
# Doesn't seem to be used in the sources and causes
|
||||
# build issues
|
||||
"PyOgg"
|
||||
];
|
||||
|
||||
pythonRelaxDeps = true;
|
@ -1,37 +1,64 @@
|
||||
{ stdenv, lib, fetchPypi, buildPythonPackage, libvorbis, flac, libogg, libopus, opusfile, substituteAll }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, libvorbis
|
||||
, flac
|
||||
, libogg
|
||||
, libopus
|
||||
, opusfile
|
||||
, substituteAll
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyogg";
|
||||
version = "0.6.9a1";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PyOgg";
|
||||
inherit version;
|
||||
sha256 = "0xabqwyknpvfc53s7il5pq6b07fcaqvz5bi5vbs3pbaw8602qvim";
|
||||
};
|
||||
pname = "pyogg";
|
||||
version = "0.6.14a1";
|
||||
|
||||
buildInputs = [ libvorbis flac libogg libopus ];
|
||||
propagatedBuidInputs = [ libvorbis flac libogg libopus opusfile ];
|
||||
# There are no tests in this package.
|
||||
doCheck = false;
|
||||
patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./pyogg-paths.patch;
|
||||
flacLibPath="${flac.out}/lib/libFLAC${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
oggLibPath="${libogg}/lib/libogg${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
vorbisLibPath="${libvorbis}/lib/libvorbis${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
vorbisFileLibPath="${libvorbis}/lib/libvorbisfile${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
vorbisEncLibPath="${libvorbis}/lib/libvorbisenc${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
opusLibPath="${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
opusFileLibPath="${opusfile}/lib/libopusfile${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
})
|
||||
];
|
||||
src = fetchPypi {
|
||||
pname = "PyOgg";
|
||||
inherit version;
|
||||
hash = "sha256-gpSzSqWckCAMRjDCzEpbhEByCRQejl0GnXpb41jpQmI=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
buildInputs = [
|
||||
libvorbis
|
||||
flac
|
||||
libogg
|
||||
libopus
|
||||
];
|
||||
|
||||
propagatedBuidInputs = [
|
||||
libvorbis
|
||||
flac
|
||||
libogg
|
||||
libopus
|
||||
opusfile
|
||||
];
|
||||
|
||||
# There are no tests in this package.
|
||||
doCheck = false;
|
||||
|
||||
# patch has dos style eol
|
||||
patchFlags = [ "-p1" "--binary" ];
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./pyogg-paths.patch;
|
||||
flacLibPath="${flac.out}/lib/libFLAC${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
oggLibPath="${libogg}/lib/libogg${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
vorbisLibPath="${libvorbis}/lib/libvorbis${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
vorbisFileLibPath="${libvorbis}/lib/libvorbisfile${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
vorbisEncLibPath="${libvorbis}/lib/libvorbisenc${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
opusLibPath="${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
opusFileLibPath="${opusfile}/lib/libopusfile${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Xiph.org's Ogg Vorbis, Opus and FLAC for Python";
|
||||
homepage = "https://github.com/Zuzu-Typ/PyOgg";
|
||||
license = lib.licenses.publicDomain;
|
||||
maintainers = with lib.maintainers; [ pmiddend ];
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ pmiddend ];
|
||||
};
|
||||
}
|
||||
|
@ -11373,8 +11373,6 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
onthespot = libsForQt5.callPackage ../applications/misc/onthespot { };
|
||||
|
||||
opencorsairlink = callPackage ../tools/misc/opencorsairlink { };
|
||||
|
||||
openfpgaloader = callPackage ../development/embedded/fpga/openfpgaloader { };
|
||||
|
Loading…
Reference in New Issue
Block a user