commit c70ac648b55bb543ccc3d0302a88fd79df521496 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix

···

       158
       158
        
         config = mkIf (ldmcfg.enable && cfg.enable) {

     

       159
       159
        
       

     

       160
       160
        
           services.xserver.displayManager.lightdm.greeter = mkDefault {

     

       161
       161
       -
             package = pkgs.lightdm_gtk_greeter.xgreeters;

     

       161
       161
       +
             package = pkgs.lightdm-gtk-greeter.xgreeters;

     

       162
       162
        
             name = "lightdm-gtk-greeter";

     

       163
       163
        
           };

     

       164
       164

+6 -22

pkgs/applications/display-managers/lightdm/default.nix

···

       25
       25
        
       , gobject-introspection

     

       26
       26
        
       , vala

     

       27
       27
        
       , fetchpatch

     

       28
       28
       -
       , withQt4 ? false

     

       29
       29
       -
       , qt4

     

       30
       28
        
       , withQt5 ? false

     

       31
       29
        
       , qtbase

     

       32
       30
        
       , yelp-tools

     
···

       36
       34
        
       

     

       37
       35
        
       stdenv.mkDerivation rec {

     

       38
       36
        
         pname = "lightdm";

     

       39
       39
       -
         version = "1.30.0";

     

       37
       37
       +
         version = "1.32.0";

     

       40
       38
        
       

     

       41
       39
        
         outputs = [ "out" "dev" ];

     

       42
       40
        
       

     

       43
       41
        
         src = fetchFromGitHub {

     

       44
       44
       -
           owner = "CanonicalLtd";

     

       42
       42
       +
           owner = "canonical";

     

       45
       43
        
           repo = pname;

     

       46
       44
        
           rev = version;

     

       47
       47
       -
           sha256 = "0i1yygmjbkdjnqdl9jn8zsa1mfs2l19qc4k2capd8q1ndhnjm2dx";

     

       45
       45
       +
           sha256 = "sha256-ttNlhWD0Ran4d3QvZ+PxbFbSUGMkfrRm+hJdQxIDJvM=";

     

       48
       46
        
         };

     

       49
       47
        
       

     

       50
       48
        
         nativeBuildInputs = [

     
···

       71
       69
        
           libxklavier

     

       72
       70
        
           pam

     

       73
       71
        
           polkit

     

       74
       74
       -
         ] ++ optional withQt4 qt4

     

       75
       75
       -
           ++ optional withQt5 qtbase;

     

       72
       72
       +
         ] ++ optional withQt5 qtbase;

     

       76
       73
        
       

     

       77
       74
        
         patches = [

     

       78
       75
        
           # Adds option to disable writing dmrc files

     
···

       81
       78
        
             sha256 = "06f7iabagrsiws2l75sx2jyljknr9js7ydn151p3qfi104d1541n";

     

       82
       79
        
           })

     

       83
       80
        
       

     

       84
       84
       -
           # Don't use etc/dbus-1/system.d

     

       85
       85
       -
           (fetchpatch {

     

       86
       86
       -
             url = "https://github.com/canonical/lightdm/commit/a99376f5f51aa147aaf81287d7ce70db76022c47.patch";

     

       87
       87
       -
             sha256 = "1zyx1qqajrmqcf9hbsapd39gmdanswd9l78rq7q6rdy4692il3yn";

     

       88
       88
       -
           })

     

       89
       89
       -
       

     

       90
       90
       -
           # https://github.com/canonical/lightdm/pull/104

     

       91
       91
       -
           (fetchpatch {

     

       92
       92
       -
             url = "https://github.com/canonical/lightdm/commit/03f218981733e50d810767f9d04e42ee156f7feb.patch";

     

       93
       93
       -
             sha256 = "07w18m2gpk29z6ym4y3lzsmg5dk3ffn39sq6lac26ap7narf4ma7";

     

       94
       94
       -
           })

     

       95
       95
       -
       

     

       96
       81
        
           # Hardcode plymouth to fix transitions.

     

       97
       82
        
           # For some reason it can't find `plymouth`

     

       98
       83
        
           # even when it's in PATH in environment.systemPackages.

     
···

       111
       96
        
           "--sysconfdir=/etc"

     

       112
       97
        
           "--disable-tests"

     

       113
       98
        
           "--disable-dmrc"

     

       114
       114
       -
         ] ++ optional withQt4 "--enable-liblightdm-qt"

     

       115
       115
       -
           ++ optional withQt5 "--enable-liblightdm-qt5";

     

       99
       99
       +
         ] ++ optional withQt5 "--enable-liblightdm-qt5";

     

       116
       100
        
       

     

       117
       101
        
         installFlags = [

     

       118
       102
        
           "sysconfdir=${placeholder "out"}/etc"

     
···

       139
       123
        
       

     

       140
       124
        
       

     

       141
       125
        
         meta = {

     

       142
       142
       -
           homepage = "https://github.com/CanonicalLtd/lightdm";

     

       126
       126
       +
           homepage = "https://github.com/canonical/lightdm";

     

       143
       127
        
           description = "A cross-desktop display manager";

     

       144
       128
        
           platforms = platforms.linux;

     

       145
       129
        
           license = licenses.gpl3;

+26 -31

pkgs/applications/display-managers/lightdm/gtk-greeter.nix

···

       1
       1
       -
       { lib, stdenv

     

       2
       2
       -
       , lightdm_gtk_greeter

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , lightdm-gtk-greeter

     

       3
       4
        
       , fetchurl

     

       4
       5
        
       , lightdm

     

       5
       6
        
       , pkg-config

     

       6
       7
        
       , intltool

     

       7
       8
        
       , linkFarm

     

       8
       9
        
       , wrapGAppsHook

     

       9
       9
       -
       , useGTK2 ? false

     

       10
       10
       -
       , gtk2

     

       11
       11
       -
       , gtk3 # gtk3 seems better supported

     

       10
       10
       +
       , gtk3

     

       12
       11
        
       , xfce4-dev-tools

     

       13
       12
        
       , at-spi2-core

     

       14
       13
        
       , librsvg

     

       15
       14
        
       , hicolor-icon-theme

     

       16
       15
        
       }:

     

       17
       16
        
       

     

       18
       18
       -
       #ToDo: bad icons with gtk2;

     

       19
       19
       -
       #  avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from

     

       20
       20
       -
       

     

       21
       21
       -
       let

     

       22
       22
       -
         ver_branch = "2.0";

     

       23
       23
       -
         version = "2.0.7";

     

       24
       24
       -
       in

     

       25
       17
        
       stdenv.mkDerivation rec {

     

       26
       18
        
         pname = "lightdm-gtk-greeter";

     

       27
       27
       -
         inherit version;

     

       19
       19
       +
         version = "2.0.8";

     

       28
       20
        
       

     

       29
       21
        
         src = fetchurl {

     

       30
       30
       -
           url = "${meta.homepage}/${ver_branch}/${version}/+download/${pname}-${version}.tar.gz";

     

       31
       31
       -
           sha256 = "1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms";

     

       22
       22
       +
           # Release tarball differs from source tarball.

     

       23
       23
       +
           url = "https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-${version}/lightdm-gtk-greeter-${version}.tar.gz";

     

       24
       24
       +
           sha256 = "vvuzAMezT/IYZf28iBIB9zD8fFYOngHRfomelHcVBhM=";

     

       32
       25
        
         };

     

       33
       26
        
       

     

       34
       34
       -
         nativeBuildInputs = [ pkg-config intltool xfce4-dev-tools wrapGAppsHook ];

     

       35
       35
       -
         buildInputs = [ lightdm librsvg hicolor-icon-theme ]

     

       36
       36
       -
           ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);

     

       27
       27
       +
         nativeBuildInputs = [

     

       28
       28
       +
           pkg-config

     

       29
       29
       +
           intltool

     

       30
       30
       +
           xfce4-dev-tools

     

       31
       31
       +
           wrapGAppsHook

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         buildInputs = [

     

       35
       35
       +
           lightdm

     

       36
       36
       +
           librsvg

     

       37
       37
       +
           hicolor-icon-theme

     

       38
       38
       +
           gtk3

     

       39
       39
       +
         ];

     

       37
       40
        
       

     

       38
       41
        
         configureFlags = [

     

       39
       42
        
           "--localstatedir=/var"

     

       40
       43
        
           "--sysconfdir=/etc"

     

       41
       44
        
           "--disable-indicator-services-command"

     

       42
       45
        
           "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically

     

       43
       43
       -
         ] ++ lib.optional useGTK2 "--with-gtk2";

     

       44
       44
       -
       

     

       45
       45
       -
         postPatch = ''

     

       46
       46
       -
           # exo-csource has been dropped from exo, and replaced by xdt-csource from xfce4-dev-tools

     

       47
       47
       -
           for f in configure.ac src/Makefile.am; do

     

       48
       48
       -
             substituteInPlace $f --replace exo-csource xdt-csource

     

       49
       49
       -
           done

     

       50
       50
       -
         '';

     

       46
       46
       +
         ];

     

       51
       47
        
       

     

       52
       48
        
         preConfigure = ''

     

       53
       49
        
           configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" )

     

       54
       50
        
         '';

     

       55
       55
       -
       

     

       56
       56
       -
         NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";

     

       57
       51
        
       

     

       58
       52
        
         installFlags = [

     

       59
       53
        
           "localstatedir=\${TMPDIR}"

     
···

       66
       60
        
         '';

     

       67
       61
        
       

     

       68
       62
        
         passthru.xgreeters = linkFarm "lightdm-gtk-greeter-xgreeters" [{

     

       69
       69
       -
           path = "${lightdm_gtk_greeter}/share/xgreeters/lightdm-gtk-greeter.desktop";

     

       63
       63
       +
           path = "${lightdm-gtk-greeter}/share/xgreeters/lightdm-gtk-greeter.desktop";

     

       70
       64
        
           name = "lightdm-gtk-greeter.desktop";

     

       71
       65
        
         }];

     

       72
       66
        
       

     

       73
       67
        
         meta = with lib; {

     

       74
       74
       -
           homepage = "https://launchpad.net/lightdm-gtk-greeter";

     

       68
       68
       +
           homepage = "https://github.com/Xubuntu/lightdm-gtk-greeter";

     

       69
       69
       +
           description = "A GTK greeter for LightDM";

     

       75
       70
        
           platforms = platforms.linux;

     

       76
       71
        
           license = licenses.gpl3Plus;

     

       77
       77
       -
           maintainers = with maintainers; [ ];

     

       72
       72
       +
           maintainers = with maintainers; [ bobby285271 ];

     

       78
       73
        
         };

     

       79
       74
        
       }

pkgs/top-level/aliases.nix

···

       754
       754
        
         libva-full = throw "'libva-full' has been renamed to/replaced by 'libva'"; # Converted to throw 2022-02-22

     

       755
       755
        
         libva1-full = throw "'libva1-full' has been renamed to/replaced by 'libva1'"; # Converted to throw 2022-02-22

     

       756
       756
        
         libwnck3 = libwnck;

     

       757
       757
       +
         lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01

     

       757
       758
        
         lighthouse = throw "lighthouse has been removed: abandoned by upstream"; # Added 2022-04-24

     

       758
       759
        
         lighttable = throw "'lighttable' crashes (SIGSEGV) on startup, has not been updated in years and depends on deprecated GTK2"; # Added 2022-06-15

     

       759
       760
        
         lilypond-unstable = lilypond; # Added 2021-03-11

+1 -1

pkgs/top-level/all-packages.nix

···

       30403
       30403
        
           inherit (xorg) libX11 libXdmcp libpthreadstubs;

     

       30404
       30404
        
         };

     

       30405
       30405
        
       

     

       30406
       30406
       -
         lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix {

     

       30406
       30406
       +
         lightdm-gtk-greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix {

     

       30407
       30407
        
           inherit (xfce) xfce4-dev-tools;

     

       30408
       30408
        
         };

     

       30409
       30409