commit 364591a874003ad946989105c3604cd4b9f4da9f · pyrox.dev/nixpkgs

nixos/modules/services/desktop-managers/pantheon.nix

···

       321
       321
        
                   elementary-code

     

       322
       322
        
                   elementary-files

     

       323
       323
        
                   elementary-mail

     

       324
       324
       +
                   elementary-maps

     

       324
       325
        
                   elementary-music

     

       325
       326
        
                   elementary-photos

     

       326
       327
        
                   elementary-screenshot

+64

pkgs/desktops/pantheon/apps/elementary-maps/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         stdenv,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         glib,

     

       6
       6
       +
         meson,

     

       7
       7
       +
         ninja,

     

       8
       8
       +
         pkg-config,

     

       9
       9
       +
         vala,

     

       10
       10
       +
         wrapGAppsHook4,

     

       11
       11
       +
         geoclue2,

     

       12
       12
       +
         geocode-glib_2,

     

       13
       13
       +
         granite7,

     

       14
       14
       +
         gtk4,

     

       15
       15
       +
         libadwaita,

     

       16
       16
       +
         libshumate,

     

       17
       17
       +
         nix-update-script,

     

       18
       18
       +
       }:

     

       19
       19
       +
       

     

       20
       20
       +
       stdenv.mkDerivation (finalAttrs: {

     

       21
       21
       +
         pname = "elementary-maps";

     

       22
       22
       +
         version = "8.1.0";

     

       23
       23
       +
       

     

       24
       24
       +
         src = fetchFromGitHub {

     

       25
       25
       +
           owner = "elementary";

     

       26
       26
       +
           repo = "maps";

     

       27
       27
       +
           tag = finalAttrs.version;

     

       28
       28
       +
           hash = "sha256-tS8UnW/oNjLaUZ1XgGuAmeMrHEa2jbtBc0xMcTKki1k=";

     

       29
       29
       +
         };

     

       30
       30
       +
       

     

       31
       31
       +
         strictDeps = true;

     

       32
       32
       +
       

     

       33
       33
       +
         nativeBuildInputs = [

     

       34
       34
       +
           glib

     

       35
       35
       +
           meson

     

       36
       36
       +
           ninja

     

       37
       37
       +
           pkg-config

     

       38
       38
       +
           vala

     

       39
       39
       +
           wrapGAppsHook4

     

       40
       40
       +
         ];

     

       41
       41
       +
       

     

       42
       42
       +
         buildInputs = [

     

       43
       43
       +
           geoclue2

     

       44
       44
       +
           geocode-glib_2

     

       45
       45
       +
           glib

     

       46
       46
       +
           granite7

     

       47
       47
       +
           gtk4

     

       48
       48
       +
           libadwaita

     

       49
       49
       +
           libshumate

     

       50
       50
       +
         ];

     

       51
       51
       +
       

     

       52
       52
       +
         passthru = {

     

       53
       53
       +
           updateScript = nix-update-script { };

     

       54
       54
       +
         };

     

       55
       55
       +
       

     

       56
       56
       +
         meta = {

     

       57
       57
       +
           homepage = "https://github.com/elementary/maps";

     

       58
       58
       +
           description = "Map viewer designed for elementary OS";

     

       59
       59
       +
           license = lib.licenses.gpl3Plus;

     

       60
       60
       +
           platforms = lib.platforms.linux;

     

       61
       61
       +
           teams = [ lib.teams.pantheon ];

     

       62
       62
       +
           mainProgram = "io.elementary.maps";

     

       63
       63
       +
         };

     

       64
       64
       +
       })

pkgs/desktops/pantheon/default.nix

···

       74
       74
        
       

     

       75
       75
        
           elementary-mail = callPackage ./apps/elementary-mail { };

     

       76
       76
        
       

     

       77
       77
       +
           elementary-maps = callPackage ./apps/elementary-maps { };

     

       78
       78
       +
       

     

       77
       79
        
           elementary-music = callPackage ./apps/elementary-music { };

     

       78
       80
        
       

     

       79
       81
        
           elementary-photos = callPackage ./apps/elementary-photos { };

+7 -12

pkgs/desktops/pantheon/libraries/granite/7/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         fetchpatch,

     

       6
       5
        
         nix-update-script,

     

       7
       6
        
         meson,

     

       8
       7
        
         ninja,

     
···

       10
       9
        
         vala,

     

       11
       10
        
         pkg-config,

     

       12
       11
        
         libgee,

     

       12
       12
       +
         libshumate,

     

       13
       13
        
         gtk4,

     

       14
       14
        
         glib,

     

       15
       15
        
         gettext,

     
···

       20
       20
        
       

     

       21
       21
        
       stdenv.mkDerivation rec {

     

       22
       22
        
         pname = "granite";

     

       23
       23
       -
         version = "7.6.0";

     

       23
       23
       +
         version = "7.7.0";

     

       24
       24
        
       

     

       25
       25
        
         outputs = [

     

       26
       26
        
           "out"

     
···

       31
       31
        
           owner = "elementary";

     

       32
       32
        
           repo = "granite";

     

       33
       33
        
           rev = version;

     

       34
       34
       -
           sha256 = "sha256-bv2rOq16xg9lCWfcLzAFN4LjBTJBxPhXvEJzutkdYzs=";

     

       34
       34
       +
           sha256 = "sha256-ypSkzz9BaVweR1C0OkkfwDl8tehMK1S5iExL14LuKmI=";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
       -
         patches = [

     

       38
       38
       -
           # Init: Avoid crash with Gtk >= 4.17

     

       39
       39
       -
           # https://github.com/elementary/granite/pull/893

     

       40
       40
       -
           (fetchpatch {

     

       41
       41
       -
             url = "https://github.com/elementary/granite/commit/60cb8c4119b579592e6c7f3b1476e4d729f58699.patch";

     

       42
       42
       -
             hash = "sha256-6NB/Tu3mdmiBd77SOi4twdY/HidyhMn7mNN+54iFLIc=";

     

       43
       43
       -
           })

     

       44
       44
       -
         ];

     

       45
       45
       -
       

     

       46
       37
        
         nativeBuildInputs = [

     

       47
       38
        
           gettext

     

       48
       39
        
           gobject-introspection

     
···

       52
       43
        
           sassc

     

       53
       44
        
           vala

     

       54
       45
        
           wrapGAppsHook4

     

       46
       46
       +
         ];

     

       47
       47
       +
       

     

       48
       48
       +
         buildInputs = [

     

       49
       49
       +
           libshumate # demo

     

       55
       50
        
         ];

     

       56
       51
        
       

     

       57
       52
        
         propagatedBuildInputs = [