@@ -1,6 +1,6 @@
1−{ stdenv, fetchgit, pkgconfig
1+{ stdenv, fetchgit, pkgconfig, linkFarm, lightdm-enso-os-greeter
22, dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
3−, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk }:
3+, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
44
55stdenv.mkDerivation {
66 version = "0.2.1";
@@ -12,12 +12,21 @@ stdenv.mkDerivation {
1212 sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz";
1313 };
1414
15+ patches = [
16+ ./fix-paths.patch
17+ ];
18+
19+ nativeBuildInputs = [
20+ cmake
21+ pkgconfig
22+ vala
23+ wrapGAppsHook
24+ ];
25+
1526 buildInputs = [
1627 dbus
1728 gtk3
1829 pcre
19− vala
20− cmake
2130 epoxy
2231 libgee
2332 libX11
@@ -29,31 +38,21 @@ stdenv.mkDerivation {
2938 at-spi2-core
3039 libxkbcommon
3140 libpthreadstubs
41+ librsvg
3242 ];
3343
34− nativeBuildInputs = [
35− pkgconfig
36− ];
37−
38− postPatch = ''
39− sed -i "s@\''${CMAKE_INSTALL_PREFIX}/@@" greeter/CMakeLists.txt
40− '';
41−
4244 preConfigure = ''
4345 cd greeter
4446 '';
4547
46− installFlags = [
47− "DESTDIR=$(out)"
48− ];
49−
50− preFixup = ''
51− mv $out/usr/* $out
52− rm -r $out/usr
53− '';
48+ passthru.xgreeters = linkFarm "enso-os-greeter-xgreeters" [{
49+ path = "${lightdm-enso-os-greeter}/share/xgreeters/pantheon-greeter.desktop";
50+ name = "pantheon-greeter.desktop";
51+ }];
5452
5553 postFixup = ''
56− rm -r $out/sbin
54+ substituteInPlace $out/share/xgreeters/pantheon-greeter.desktop \
55+ --replace "pantheon-greeter" "$out/bin/pantheon-greeter"
5756 '';
5857
5958 meta = with stdenv.lib; {