commit dfbe6e8be41ec775b2aa7a5e24a19191e26d79e5 · pyrox.dev/nixpkgs

+48 -20

pkgs/by-name/mi/miniaudio/package.nix

···

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         testers,

     

       6
       6
       +
       

     

       7
       7
       +
         cmake,

     

       8
       8
       +
         ninja,

     

       9
       9
       +
       

     

       10
       10
       +
         alsa-lib,

     

       11
       11
       +
         libjack2,

     

       12
       12
       +
         libpulseaudio,

     

       13
       13
       +
         libvorbis,

     

       14
       14
       +
         opusfile,

     

       15
       15
       +
         sndio,

     

       16
       16
       +
       

     

       17
       17
       +
         alsaSupport ? true,

     

       18
       18
       +
         pulseSupport ? true,

     

       19
       19
       +
         jackSupport ? true,

     

       20
       20
       +
         sndioSupport ? true,

     

       6
       21
        
       }:

     

       7
       22
        
       stdenv.mkDerivation (finalAttrs: {

     

       8
       23
        
         pname = "miniaudio";

     

       9
       9
       -
         version = "0.11.22";

     

       24
       24
       +
         version = "0.11.23";

     

       10
       25
        
       

     

       11
       26
        
         src = fetchFromGitHub {

     

       12
       27
        
           owner = "mackron";

     

       13
       28
        
           repo = "miniaudio";

     

       14
       14
       -
           rev = finalAttrs.version;

     

       15
       15
       -
           hash = "sha256-o/7sfBcrhyXEakccOAogQqm8dO4Szj1QSpaIHg6OSt4=";

     

       29
       29
       +
           tag = finalAttrs.version;

     

       30
       30
       +
           hash = "sha256-ZrfKw5a3AtIER2btCKWhuvygasNaHNf9EURf1Kv96Vc=";

     

       16
       31
        
         };

     

       17
       32
        
       

     

       18
       18
       -
         postInstall = ''

     

       19
       19
       -
           mkdir -p $out/include

     

       20
       20
       -
           mkdir -p $out/lib/pkgconfig

     

       33
       33
       +
         outputs = [

     

       34
       34
       +
           "out"

     

       35
       35
       +
           "dev"

     

       36
       36
       +
         ];

     

       21
       37
        
       

     

       22
       22
       -
           cp $src/miniaudio.h $out/include

     

       23
       23
       -
           ln -s $out/include/miniaudio.h $out

     

       38
       38
       +
         nativeBuildInputs = [

     

       39
       39
       +
           cmake

     

       40
       40
       +
           ninja

     

       41
       41
       +
         ];

     

       24
       42
        
       

     

       25
       25
       -
           cp -r $src/extras $out/

     

       43
       43
       +
         buildInputs = [

     

       44
       44
       +
           libvorbis

     

       45
       45
       +
           opusfile

     

       46
       46
       +
         ]

     

       47
       47
       +
         ++ lib.optional pulseSupport libpulseaudio

     

       48
       48
       +
         ++ lib.optional jackSupport libjack2

     

       49
       49
       +
         ++ lib.optional alsaSupport alsa-lib

     

       50
       50
       +
         ++ lib.optional sndioSupport sndio;

     

       26
       51
        
       

     

       27
       27
       -
           cat <<EOF >$out/lib/pkgconfig/miniaudio.pc

     

       28
       28
       -
           prefix=$out

     

       29
       29
       -
           includedir=$out/include

     

       52
       52
       +
         cmakeFlags = [

     

       53
       53
       +
           (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))

     

       54
       54
       +
           (lib.cmakeBool "MINIAUDIO_NO_RUNTIME_LINKING" true)

     

       55
       55
       +
           (lib.cmakeBool "MINIAUDIO_BUILD_TESTS" true)

     

       56
       56
       +
           (lib.cmakeBool "MINIAUDIO_BUILD_EXAMPLES" true)

     

       30
       57
        
       

     

       31
       31
       -
           Name: miniaudio

     

       32
       32
       -
           Description: An audio playback and capture library in a single source file.

     

       33
       33
       -
           Version: $version

     

       34
       34
       -
           Cflags: -I$out/include

     

       35
       35
       -
           Libs: -lm -lpthread -latomic

     

       36
       36
       -
           EOF

     

       37
       37
       -
         '';

     

       58
       58
       +
           (lib.cmakeBool "MINIAUDIO_ENABLE_ONLY_SPECIFIC_BACKENDS" true)

     

       59
       59
       +
           (lib.cmakeBool "MINIAUDIO_ENABLE_PULSEAUDIO" pulseSupport)

     

       60
       60
       +
           (lib.cmakeBool "MINIAUDIO_ENABLE_JACK" jackSupport)

     

       61
       61
       +
           (lib.cmakeBool "MINIAUDIO_ENABLE_SNDIO" alsaSupport)

     

       62
       62
       +
           (lib.cmakeBool "MINIAUDIO_ENABLE_ALSA" sndioSupport)

     

       63
       63
       +
         ];

     

       64
       64
       +
       

     

       65
       65
       +
         doCheck = true;

     

       38
       66
        
       

     

       39
       67
        
         passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       40
       68
        
       

     
···

       48
       76
        
           ];

     

       49
       77
        
           maintainers = [ maintainers.jansol ];

     

       50
       78
        
           pkgConfigModules = [ "miniaudio" ];

     

       51
       51
       -
           platforms = platforms.all;

     

       79
       79
       +
           platforms = platforms.linux;

     

       52
       80
        
         };

     

       53
       81
        
       })

+10 -20

pkgs/by-name/sf/sfml/package.nix

···

       6
       6
        
       

     

       7
       7
        
         # nativeBuildInputs

     

       8
       8
        
         cmake,

     

       9
       9
       +
         pkg-config,

     

       9
       10
        
       

     

       10
       11
        
         # buildInputs

     

       11
       12
        
         flac,

     
···

       13
       14
        
         glew,

     

       14
       15
        
         libjpeg,

     

       15
       16
        
         libvorbis,

     

       17
       17
       +
         miniaudio,

     

       16
       18
        
         udev,

     

       17
       19
        
         libXi,

     

       18
       20
        
         libX11,

     
···

       20
       22
        
         libXrandr,

     

       21
       23
        
         libXrender,

     

       22
       24
        
         xcbutilimage,

     

       23
       23
       -
       

     

       24
       24
       -
         # miniaudio

     

       25
       25
       -
         alsa-lib,

     

       26
       26
       -
         libjack2,

     

       27
       27
       -
         libpulseaudio,

     

       28
       28
       -
         sndio,

     

       29
       25
        
       }:

     

       30
       26
        
       

     

       31
       27
        
       stdenv.mkDerivation (finalAttrs: {

     
···

       45
       41
        
             url = "https://github.com/SFML/SFML/commit/a87763becbc4672b38f1021418ed94caa0f6540a.patch?full_index=1";

     

       46
       42
        
             hash = "sha256-tJmXTdhwtWq6XfUPBzw47yTrc6EzwmSiVj9n6jQwHig=";

     

       47
       43
        
           })

     

       44
       44
       +
       

     

       45
       45
       +
           # Not upstreamble in the near future, see https://github.com/SFML/SFML/pull/3555

     

       46
       46
       +
           ./unvendor-miniaudio.patch

     

       48
       47
        
         ];

     

       49
       48
        
       

     

       50
       50
       -
         nativeBuildInputs = [ cmake ];

     

       49
       49
       +
         nativeBuildInputs = [

     

       50
       50
       +
           cmake

     

       51
       51
       +
           pkg-config

     

       52
       52
       +
         ];

     

       51
       53
        
         buildInputs = [

     

       52
       54
        
           flac

     

       53
       55
        
           freetype

     

       54
       56
        
           glew

     

       55
       57
        
           libjpeg

     

       56
       58
        
           libvorbis

     

       59
       59
       +
           miniaudio

     

       57
       60
        
         ]

     

       58
       61
        
         ++ lib.optional stdenv.hostPlatform.isLinux udev

     

       59
       62
        
         ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [

     
···

       65
       68
        
           xcbutilimage

     

       66
       69
        
         ];

     

       67
       70
        
       

     

       68
       68
       -
         # We rely on RUNPATH

     

       69
       69
       -
         dontPatchELF = true;

     

       70
       70
       -
       

     

       71
       71
        
         cmakeFlags = [

     

       72
       72
        
           (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))

     

       73
       73
        
           (lib.cmakeBool "SFML_INSTALL_PKGCONFIG_FILES" true)

     

       74
       74
        
           (lib.cmakeFeature "SFML_MISC_INSTALL_PREFIX" "share/SFML")

     

       75
       75
        
           (lib.cmakeBool "SFML_BUILD_FRAMEWORKS" false)

     

       76
       76
        
           (lib.cmakeBool "SFML_USE_SYSTEM_DEPS" true)

     

       77
       77
       -
       

     

       78
       78
       -
           # FIXME: Unvendor miniaudio and move these deps there

     

       79
       79
       -
           (lib.cmakeFeature "CMAKE_INSTALL_RPATH" (

     

       80
       80
       -
             lib.makeLibraryPath [

     

       81
       81
       -
               alsa-lib

     

       82
       82
       -
               libjack2

     

       83
       83
       -
               libpulseaudio

     

       84
       84
       -
               sndio

     

       85
       85
       -
             ]

     

       86
       86
       -
           ))

     

       87
       77
        
         ];

     

       88
       78
        
       

     

       89
       79
        
         meta = {

+35

pkgs/by-name/sf/sfml/unvendor-miniaudio.patch

···

       1
       1
       +
       diff --git a/src/SFML/Audio/CMakeLists.txt b/src/SFML/Audio/CMakeLists.txt

     

       2
       2
       +
       index 7567205c..ecbb4ea1 100644

     

       3
       3
       +
       --- a/src/SFML/Audio/CMakeLists.txt

     

       4
       4
       +
       +++ b/src/SFML/Audio/CMakeLists.txt

     

       5
       5
       +
       @@ -10,7 +10,6 @@ set(SRC

     

       6
       6
       +
            ${INCROOT}/Export.hpp

     

       7
       7
       +
            ${SRCROOT}/Listener.cpp

     

       8
       8
       +
            ${INCROOT}/Listener.hpp

     

       9
       9
       +
       -    ${SRCROOT}/Miniaudio.cpp

     

       10
       10
       +
            ${SRCROOT}/MiniaudioUtils.hpp

     

       11
       11
       +
            ${SRCROOT}/MiniaudioUtils.cpp

     

       12
       12
       +
            ${SRCROOT}/Music.cpp

     

       13
       13
       +
       @@ -169,8 +168,10 @@ sfml_add_library(Audio

     

       14
       14
       +
        # avoids warnings in vorbisfile.h

     

       15
       15
       +
        target_compile_definitions(sfml-audio PRIVATE OV_EXCLUDE_STATIC_CALLBACKS FLAC__NO_DLL)

     

       16
       16
       +
        

     

       17
       17
       +
       -# disable miniaudio features we do not use

     

       18
       18
       +
       -target_compile_definitions(sfml-audio PRIVATE MA_NO_MP3 MA_NO_FLAC MA_NO_ENCODING MA_NO_RESOURCE_MANAGER MA_NO_GENERATION)

     

       19
       19
       +
       +find_package(PkgConfig REQUIRED)

     

       20
       20
       +
       +pkg_check_modules(miniaudio REQUIRED IMPORTED_TARGET miniaudio)

     

       21
       21
       +
       +target_link_libraries(sfml-audio PRIVATE PkgConfig::miniaudio)

     

       22
       22
       +
       +target_include_directories(sfml-audio SYSTEM PRIVATE "${miniaudio_INCLUDE_DIRS}/miniaudio")

     

       23
       23
       +
        

     

       24
       24
       +
        # use standard fixed-width integer types

     

       25
       25
       +
        target_compile_definitions(sfml-audio PRIVATE MA_USE_STDINT)

     

       26
       26
       +
       @@ -186,9 +187,6 @@ if(SFML_OS_IOS)

     

       27
       27
       +
            target_link_libraries(sfml-audio PRIVATE "-framework Foundation" "-framework CoreFoundation" "-framework CoreAudio" "-framework AudioToolbox" "-framework AVFoundation")

     

       28
       28
       +
        endif()

     

       29
       29
       +
        

     

       30
       30
       +
       -# miniaudio sources

     

       31
       31
       +
       -target_include_directories(sfml-audio SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/miniaudio")

     

       32
       32
       +
       -

     

       33
       33
       +
        # minimp3 sources

     

       34
       34
       +
        target_include_directories(sfml-audio SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/minimp3")

     

       35
       35
       +

+1 -20

pkgs/development/python-modules/miniaudio/default.nix

···

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         setuptools,

     

       6
       6
       -
         miniaudio,

     

       7
       6
        
         cffi,

     

       8
       7
        
         pytestCheckHook,

     

       9
       8
        
       }:

     

       10
       9
        
       

     

       11
       11
       -
       let

     

       12
       12
       -
         # TODO: recheck after 1.59

     

       13
       13
       -
         miniaudio' = miniaudio.overrideAttrs (oldAttrs: rec {

     

       14
       14
       -
           version = "0.11.16"; # cffi breakage with 0.11.17

     

       15
       15
       -
           src = fetchFromGitHub {

     

       16
       16
       -
             inherit (oldAttrs.src) owner repo;

     

       17
       17
       -
             rev = "refs/tags/${version}";

     

       18
       18
       -
             hash = "sha256-POe/dYPJ25RKNGIhaLoqxm9JJ08MrTyHVN4NmaGOdwM=";

     

       19
       19
       -
           };

     

       20
       20
       -
         });

     

       21
       21
       -
       in

     

       22
       10
        
       buildPythonPackage rec {

     

       23
       11
        
         pname = "miniaudio";

     

       24
       12
        
         version = "1.61";

     
···

       31
       19
        
           hash = "sha256-H3o2IWGuMqLrJTzQ7w636Ito6f57WBtMXpXXzrZ7UD8=";

     

       32
       20
        
         };

     

       33
       21
        
       

     

       34
       34
       -
         postPatch = ''

     

       35
       35
       -
           rm -r miniaudio

     

       36
       36
       -
           ln -s ${miniaudio'} miniaudio

     

       37
       37
       -
           substituteInPlace build_ffi_module.py \

     

       38
       38
       -
             --replace-fail "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c";

     

       39
       39
       -
           substituteInPlace miniaudio.c \

     

       40
       40
       -
             --replace-fail "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c";

     

       41
       41
       -
         '';

     

       22
       22
       +
         # TODO: Properly unvendor miniaudio c library

     

       42
       23
        
       

     

       43
       24
        
         build-system = [ setuptools ];

     

       44
       25

+1 -3

pkgs/top-level/python-packages.nix

···

       9331
       9331
        
       

     

       9332
       9332
        
         minexr = callPackage ../development/python-modules/minexr { };

     

       9333
       9333
        
       

     

       9334
       9334
       -
         miniaudio = callPackage ../development/python-modules/miniaudio {

     

       9335
       9335
       -
           inherit (pkgs) miniaudio;

     

       9336
       9336
       -
         };

     

       9334
       9334
       +
         miniaudio = callPackage ../development/python-modules/miniaudio { };

     

       9337
       9335
        
       

     

       9338
       9336
        
         minichain = callPackage ../development/python-modules/minichain { };

     

       9339
       9337