commit 141e85cc697538e2476d0c81f6e5d5153bd220cd · pyrox.dev/nixpkgs

+1

nixos/modules/services/x11/desktop-managers/cinnamon.nix

···

       128
        
               cinnamon-session

     

       129
        
               cinnamon-desktop

     

       130
        
               cinnamon-menus

     

       0
        
       
     

       131
        
       

     

       132
        
               # utils needed by some scripts

     

       133
        
               killall

···

       128
        
               cinnamon-session

     

       129
        
               cinnamon-desktop

     

       130
        
               cinnamon-menus

     

       131
       +
               cinnamon-translations

     

       132
        
       

     

       133
        
               # utils needed by some scripts

     

       134
        
               killall

+5 -1

pkgs/desktops/cinnamon/cinnamon-common/default.nix

···

       6
        
       , cinnamon-desktop

     

       7
        
       , cinnamon-menus

     

       8
        
       , cinnamon-session

     

       0
        
       
     

       9
        
       , cjs

     

       10
        
       , fetchFromGitHub

     

       11
        
       , gdk-pixbuf

     
···

       115
        
           gtk-doc

     

       116
        
         ];

     

       117
        
       

     

       118
       -
         configureFlags = [ "--disable-static" "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt" "--with-libxml=${libxml2.dev}/include/libxml2" "--enable-gtk-doc=no" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       119
        
       

     

       120
        
         postPatch = ''

     

       121
        
           find . -type f -exec sed -i \

···

       6
        
       , cinnamon-desktop

     

       7
        
       , cinnamon-menus

     

       8
        
       , cinnamon-session

     

       9
       +
       , cinnamon-translations

     

       10
        
       , cjs

     

       11
        
       , fetchFromGitHub

     

       12
        
       , gdk-pixbuf

     
···

       116
        
           gtk-doc

     

       117
        
         ];

     

       118
        
       

     

       119
       +
         # use locales from cinnamon-translations (not using --localedir because datadir is used)

     

       120
       +
         postInstall = ''

     

       121
       +
           ln -s ${cinnamon-translations}/share/locale $out/share/locale

     

       122
       +
         '';

     

       123
        
       

     

       124
        
         postPatch = ''

     

       125
        
           find . -type f -exec sed -i \

+4

pkgs/desktops/cinnamon/cinnamon-control-center/default.nix

···

       28
        
       , gdk-pixbuf

     

       29
        
       , meson

     

       30
        
       , ninja

     

       0
        
       
     

       31
        
       }:

     

       32
        
       

     

       33
        
       stdenv.mkDerivation rec {

     
···

       83
        
         '';

     

       84
        
       

     

       85
        
         mesonFlags = [

     

       0
        
       
     

       86
        
           "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"

     

       0
        
       
     

       0
        
       
     

       87
        
         ];

     

       88
        
       

     

       89
        
         preInstall = ''

···

       28
        
       , gdk-pixbuf

     

       29
        
       , meson

     

       30
        
       , ninja

     

       31
       +
       , cinnamon-translations

     

       32
        
       }:

     

       33
        
       

     

       34
        
       stdenv.mkDerivation rec {

     
···

       84
        
         '';

     

       85
        
       

     

       86
        
         mesonFlags = [

     

       87
       +
           # TODO: https://github.com/NixOS/nixpkgs/issues/36468

     

       88
        
           "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"

     

       89
       +
           # use locales from cinnamon-translations

     

       90
       +
           "--localedir=${cinnamon-translations}/share/locale"

     

       91
        
         ];

     

       92
        
       

     

       93
        
         preInstall = ''

+9 -2

pkgs/desktops/cinnamon/cinnamon-session/default.nix

···

       1
        
       { fetchFromGitHub

     

       2
        
       , cinnamon-desktop

     

       3
        
       , cinnamon-settings-daemon

     

       0
        
       
     

       4
        
       , dbus-glib

     

       5
        
       , docbook_xsl

     

       6
        
       , docbook_xml_dtd_412

     
···

       80
        
           xmlto

     

       81
        
         ];

     

       82
        
       

     

       83
       -
         # TODO: https://github.com/NixOS/nixpkgs/issues/36468

     

       84
       -
         mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" "-Dgconf=false" "-DENABLE_IPV6=true" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       85
        
       

     

       86
        
         postPatch = ''

     

       87
        
           chmod +x data/meson_install_schemas.py # patchShebangs requires executable file

···

       1
        
       { fetchFromGitHub

     

       2
        
       , cinnamon-desktop

     

       3
        
       , cinnamon-settings-daemon

     

       4
       +
       , cinnamon-translations

     

       5
        
       , dbus-glib

     

       6
        
       , docbook_xsl

     

       7
        
       , docbook_xml_dtd_412

     
···

       81
        
           xmlto

     

       82
        
         ];

     

       83
        
       

     

       84
       +
         mesonFlags = [

     

       85
       +
           # TODO: https://github.com/NixOS/nixpkgs/issues/36468

     

       86
       +
           "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"

     

       87
       +
           "-Dgconf=false"

     

       88
       +
           "-DENABLE_IPV6=true"

     

       89
       +
           # use locales from cinnamon-translations

     

       90
       +
           "--localedir=${cinnamon-translations}/share/locale"

     

       91
       +
         ];

     

       92
        
       

     

       93
        
         postPatch = ''

     

       94
        
           chmod +x data/meson_install_schemas.py # patchShebangs requires executable file

+6

pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix

···

       1
        
       { fetchFromGitHub

     

       2
        
       , cinnamon-desktop

     

       0
        
       
     

       3
        
       , colord

     

       4
        
       , glib

     

       5
        
       , gsettings-desktop-schemas

     
···

       102
        
       

     

       103
        
         postPatch = ''

     

       104
        
           sed "s|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g" -i plugins/datetime/system-timezone.h

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       105
        
         '';

     

       106
        
       

     

       107
        
         # So the polkit policy can reference /run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper

···

       1
        
       { fetchFromGitHub

     

       2
        
       , cinnamon-desktop

     

       3
       +
       , cinnamon-translations

     

       4
        
       , colord

     

       5
        
       , glib

     

       6
        
       , gsettings-desktop-schemas

     
···

       103
        
       

     

       104
        
         postPatch = ''

     

       105
        
           sed "s|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g" -i plugins/datetime/system-timezone.h

     

       106
       +
         '';

     

       107
       +
       

     

       108
       +
         # use locales from cinnamon-translations (not using --localedir because datadir is used)

     

       109
       +
         postInstall = ''

     

       110
       +
           ln -s ${cinnamon-translations}/share/locale $out/share/locale

     

       111
        
         '';

     

       112
        
       

     

       113
        
         # So the polkit policy can reference /run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper

+3

pkgs/desktops/cinnamon/nemo/default.nix

···

       16
        
       , exempi

     

       17
        
       , intltool

     

       18
        
       , shared-mime-info

     

       0
        
       
     

       19
        
       }:

     

       20
        
       

     

       21
        
       stdenv.mkDerivation rec {

     
···

       57
        
         mesonFlags = [

     

       58
        
           # TODO: https://github.com/NixOS/nixpkgs/issues/36468

     

       59
        
           "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"

     

       0
        
       
     

       0
        
       
     

       60
        
         ];

     

       61
        
       

     

       62
        
         meta = with lib; {

···

       16
        
       , exempi

     

       17
        
       , intltool

     

       18
        
       , shared-mime-info

     

       19
       +
       , cinnamon-translations

     

       20
        
       }:

     

       21
        
       

     

       22
        
       stdenv.mkDerivation rec {

     
···

       58
        
         mesonFlags = [

     

       59
        
           # TODO: https://github.com/NixOS/nixpkgs/issues/36468

     

       60
        
           "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"

     

       61
       +
           # use locales from cinnamon-translations

     

       62
       +
           "--localedir=${cinnamon-translations}/share/locale"

     

       63
        
         ];

     

       64
        
       

     

       65
        
         meta = with lib; {