commit 19e940b40fab9235300441b60163e78e8c617249 · pyrox.dev/nixpkgs

+3 -3

pkgs/development/libraries/SDL2/default.nix

···

       59
       59
        
       

     

       60
       60
        
       stdenv.mkDerivation rec {

     

       61
       61
        
         pname = "SDL2";

     

       62
       62
       -
         version = "2.0.22";

     

       62
       62
       +
         version = "2.24.0";

     

       63
       63
        
       

     

       64
       64
        
         src = fetchurl {

     

       65
       65
        
           url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz";

     

       66
       66
       -
           sha256 = "sha256-/ny/MSeILj/HJZp1oMtYViAnLFF0XThSq53YeWBpfy4=";

     

       66
       66
       +
           sha256 = "sha256-keTDSxdo+S05mweOFxRIxq8Yyv2nQ5h+0gZKKJVNbZc=";

     

       67
       67
        
         };

     

       68
       68
       -
         dontDisableStatic = withStatic;

     

       68
       68
       +
         dontDisableStatic = if withStatic then 1 else 0;

     

       69
       69
        
         outputs = [ "out" "dev" ];

     

       70
       70
        
         outputBin = "dev"; # sdl-config

     

       71
       71

+12 -14

pkgs/development/libraries/SDL2/find-headers.patch

···

       1
       1
        
       diff --git a/sdl2-config.cmake.in b/sdl2-config.cmake.in

     

       2
       2
       -
       index c570511fa..ca694f595 100644

     

       2
       2
       +
       index db864aab9..b94e16043 100644

     

       3
       3
        
       --- a/sdl2-config.cmake.in

     

       4
       4
        
       +++ b/sdl2-config.cmake.in

     

       5
       5
       -
       @@ -7,7 +7,8 @@ set(includedir "@includedir@")

     

       6
       6
       -
        set(SDL2_PREFIX "${prefix}")

     

       7
       7
       -
        set(SDL2_EXEC_PREFIX "${exec_prefix}")

     

       8
       8
       -
        set(SDL2_LIBDIR "${libdir}")

     

       9
       9
       -
       -set(SDL2_INCLUDE_DIRS "${includedir}/SDL2")

     

       10
       10
       -
       +set(SDL2_INCLUDE_DIRS "${includedir}/SDL2" $ENV{SDL2_PATH})

     

       5
       5
       +
       @@ -26,7 +26,9 @@ set_and_check(SDL2_EXEC_PREFIX    "${exec_prefix}")

     

       6
       6
       +
        set_and_check(SDL2_BINDIR         "${bindir}")

     

       7
       7
       +
        set_and_check(SDL2_INCLUDE_DIR    "${includedir}/SDL2")

     

       8
       8
       +
        set_and_check(SDL2_LIBDIR         "${libdir}")

     

       9
       9
       +
       -set(SDL2_INCLUDE_DIRS             "${includedir};${SDL2_INCLUDE_DIR}")

     

       10
       10
       +
       +

     

       11
       11
       +
       +set(SDL2_INCLUDE_DIRS "${includedir};${SDL2_INCLUDE_DIR}" $ENV{SDL2_PATH})

     

       11
       12
        
       +separate_arguments(SDL2_INCLUDE_DIRS)

     

       12
       12
       -
        set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@")

     

       13
       13
       -
        string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)

     

       14
       13
        
        

     

       14
       14
       +
        set(SDL2_LIBRARIES SDL2::SDL2)

     

       15
       15
       +
        set(SDL2_STATIC_LIBRARIES SDL2::SDL2-static)

     

       15
       16
        
       diff --git a/sdl2-config.in b/sdl2-config.in

     

       16
       16
       -
       index 5a2aed292..7c55f0a28 100644

     

       17
       17
       +
       index f6eca7668..c0cd94590 100644

     

       17
       18
        
       --- a/sdl2-config.in

     

       18
       19
        
       +++ b/sdl2-config.in

     

       19
       19
       -
       @@ -42,7 +42,11 @@ while test $# -gt 0; do

     

       20
       20
       +
       @@ -46,7 +46,11 @@ while test $# -gt 0; do

     

       20
       21
        
              echo @SDL_VERSION@

     

       21
       22
        
              ;;

     

       22
       23
        
            --cflags)

     
···

       29
       30
        
              ;;

     

       30
       31
        
        @ENABLE_SHARED_TRUE@    --libs)

     

       31
       32
        
        @ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@

     

       32
       32
       -
       -- 

     

       33
       33
       -
       2.33.1

     

       34
       34
       -

+8 -1

pkgs/development/libraries/ffmpeg/4.nix

···

       1
       1
       -
       { callPackage

     

       1
       1
       +
       { callPackage, fetchpatch

     

       2
       2
        
       # Darwin frameworks

     

       3
       3
        
       , Cocoa, CoreMedia, VideoToolbox

     

       4
       4
        
       , stdenv, lib

     
···

       10
       10
        
         branch = version;

     

       11
       11
        
         sha256 = "sha256-+YpIJSDEdQdSGpB5FNqp77wThOBZG1r8PaGKqJfeKUg=";

     

       12
       12
        
         darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];

     

       13
       13
       +
         patches = [

     

       14
       14
       +
           #  sdl2 recently changed their versioning

     

       15
       15
       +
           (fetchpatch {

     

       16
       16
       +
             url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=e5163b1d34381a3319214a902ef1df923dd2eeba";

     

       17
       17
       +
             hash = "sha256-nLhP2+34cj5EgpnUrePZp60nYAxmbhZAEDfay4pBVk0=";

     

       18
       18
       +
           })

     

       19
       19
       +
         ];

     

       13
       20
        
       } // args)