commit 33ed5aeef7c05e994760fa5882362f3d3ca31afb · pyrox.dev/nixpkgs

+5 -5

pkgs/development/libraries/appstream/default.nix

···

       14
       14
        
       , glib

     

       15
       15
        
       , xapian

     

       16
       16
        
       , libxml2

     

       17
       17
       +
       , libxmlb

     

       17
       18
        
       , libyaml

     

       18
       19
        
       , gobject-introspection

     

       19
       20
        
       , pcre

     

       20
       21
        
       , itstool

     

       21
       22
        
       , gperf

     

       22
       23
        
       , vala

     

       23
       23
       -
       , lmdb

     

       24
       24
        
       , curl

     

       25
       25
        
       }:

     

       26
       26
        
       

     

       27
       27
        
       stdenv.mkDerivation rec {

     

       28
       28
        
         pname = "appstream";

     

       29
       29
       -
         version = "0.14.4";

     

       29
       29
       +
         version = "0.15.2";

     

       30
       30
        
       

     

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

     

       32
       32
        
       

     
···

       34
       34
        
           owner = "ximion";

     

       35
       35
        
           repo = "appstream";

     

       36
       36
        
           rev = "v${version}";

     

       37
       37
       -
           sha256 = "sha256-DJXCw50f+8c58bJw6xx0ECfkc9/KcWaeA+ne2zmTyhg=";

     

       37
       37
       +
           sha256 = "sha256-/JZ49wjtcInbGUOVVjevVSrLCHcA60FMT165rhfb78Q=";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         patches = [

     
···

       65
       65
        
           glib

     

       66
       66
        
           xapian

     

       67
       67
        
           libxml2

     

       68
       68
       +
           libxmlb

     

       68
       69
        
           libyaml

     

       69
       70
        
           gperf

     

       70
       70
       -
           lmdb

     

       71
       71
        
           curl

     

       72
       72
        
         ];

     

       73
       73
        
       

     
···

       88
       88
        
           '';

     

       89
       89
        
           license = licenses.lgpl21Plus;

     

       90
       90
        
           platforms = platforms.unix;

     

       91
       91
       -
        };

     

       91
       91
       +
         };

     

       92
       92
        
       }

+10 -7

pkgs/development/libraries/appstream/fix-paths.patch

···

       1
       1
        
       diff --git a/data/meson.build b/data/meson.build

     

       2
       2
       -
       index 1eb3dfb0..623b66ec 100644

     

       2
       2
       +
       index 53f31cb4..90f40e77 100644

     

       3
       3
        
       --- a/data/meson.build

     

       4
       4
        
       +++ b/data/meson.build

     

       5
       5
       -
       @@ -26,4 +26,4 @@ i18n.merge_file (

     

       5
       5
       +
       @@ -68,7 +68,7 @@ test('as-validate_metainfo.cli',

     

       6
       6
        
        )

     

       7
       7
        
        

     

       8
       8
       -
        install_data ('appstream.conf',

     

       9
       9
       -
       -              install_dir: get_option('sysconfdir'))

     

       10
       10
       -
       +              install_dir: get_option('prefix') / 'etc')

     

       8
       8
       +
        install_data('appstream.conf',

     

       9
       9
       +
       -             install_dir: get_option('sysconfdir'))

     

       10
       10
       +
       +             install_dir: get_option('prefix') / 'etc')

     

       11
       11
       +
        

     

       12
       12
       +
        if get_option('compose')

     

       13
       13
       +
            ascompose_metainfo = 'org.freedesktop.appstream.compose.metainfo.xml'

     

       11
       14
        
       diff --git a/meson.build b/meson.build

     

       12
       12
       -
       index dc1fb1a5..5ee03b73 100644

     

       15
       15
       +
       index 2efe86b7..9dc79e28 100644

     

       13
       16
        
       --- a/meson.build

     

       14
       17
        
       +++ b/meson.build

     

       15
       15
       -
       @@ -108,12 +108,12 @@ if get_option ('gir')

     

       18
       18
       +
       @@ -107,12 +107,12 @@ if get_option ('gir')

     

       16
       19
        
            dependency('gobject-introspection-1.0', version: '>=1.56')

     

       17
       20
        
        endif

     

       18
       21