public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lightdm_gtk_greeter: exo-csource was replaced by xdt-source

This commit is contained in:
José Romildo Malaquias 2021-02-27 18:24:44 -03:00
parent e44e0f63a9
commit 73350f7cb7
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/display-managers/lightdm/gtk-greeter.nix
View File

@ -9,7 +9,7 @@
, useGTK2 ? false , useGTK2 ? false
, gtk2 , gtk2
, gtk3 # gtk3 seems better supported , gtk3 # gtk3 seems better supported
, exo , xfce4-dev-tools
, at-spi2-core , at-spi2-core
, librsvg , librsvg
, hicolor-icon-theme , hicolor-icon-theme
@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
sha256 = "1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms"; sha256 = "1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms";
}; };
nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; nativeBuildInputs = [ pkg-config intltool xfce4-dev-tools wrapGAppsHook ];
buildInputs = [ lightdm exo librsvg hicolor-icon-theme ] buildInputs = [ lightdm librsvg hicolor-icon-theme ]
++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);
configureFlags = [ configureFlags = [
@ -42,6 +42,13 @@ stdenv.mkDerivation rec {
"--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically
] ++ lib.optional useGTK2 "--with-gtk2"; ] ++ lib.optional useGTK2 "--with-gtk2";
postPatch = ''
# exo-csource has been dropped from exo, and replaced by xdt-csource from xfce4-dev-tools
for f in configure.ac src/Makefile.am; do
substituteInPlace $f --replace exo-csource xdt-csource
done
'';
preConfigure = '' preConfigure = ''
configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" ) configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" )
''; '';

2
pkgs/top-level/all-packages.nix
View File

@ -25503,7 +25503,7 @@ in
}; };
lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix {
inherit (xfce) exo; inherit (xfce) xfce4-dev-tools;
}; };
lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { }; lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { };