git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/enso-os: don't wrap in module
commit7814a2f566b153fb7bc802bcc36aab7848b02484 authorworldofpeace <worldofpeace@protonmail.ch> dateWed 11 Sep 2019, 07:00 (7 years ago) parentfeab607
3 files changed+52−49
nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix+8−28 pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix+20−21 pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch+24
nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix+8−28
@@ -10,32 +10,6 @@ let
1010 icons = cfg.iconTheme.package;
1111 cursors = cfg.cursorTheme.package;
1212
13− # We need a few things in the environment for the greeter to run with
14− # fonts/icons.
15− wrappedEnsoGreeter = pkgs.runCommand "lightdm-enso-os-greeter" {
16− buildInputs = [ pkgs.makeWrapper ];
17− preferLocalBuild = true;
18− } ''
19− # This wrapper ensures that we actually get themes
20− makeWrapper ${pkgs.lightdm-enso-os-greeter}/bin/pantheon-greeter \
21− $out/greeter \
22− --prefix PATH : "${pkgs.glibc.bin}/bin" \
23− --set GDK_PIXBUF_MODULE_FILE "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
24− --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \
25− --set GTK_EXE_PREFIX "${theme}" \
26− --set GTK_DATA_PREFIX "${theme}" \
27− --set XDG_DATA_DIRS "${theme}/share:${icons}/share:${cursors}/share" \
28− --set XDG_CONFIG_HOME "${theme}/share"
29−
30− cat - > $out/lightdm-enso-os-greeter.desktop << EOF
31− [Desktop Entry]
32− Name=LightDM Greeter
33− Comment=This runs the LightDM Greeter
34− Exec=$out/greeter
35− Type=Application
36− EOF
37− '';
38−
3913 ensoGreeterConf = pkgs.writeText "lightdm-enso-os-greeter.conf" ''
4014 [greeter]
4115 default-wallpaper=${ldmcfg.background}
@@ -144,10 +118,16 @@ in {
144118 config = mkIf (ldmcfg.enable && cfg.enable) {
145119 environment.etc."lightdm/greeter.conf".source = ensoGreeterConf;
146120
121+ environment.systemPackages = [
122+ cursors
123+ icons
124+ theme
125+ ];
126+
147127 services.xserver.displayManager.lightdm = {
148128 greeter = mkDefault {
149− package = wrappedEnsoGreeter;
150− name = "lightdm-enso-os-greeter";
129+ package = pkgs.lightdm-enso-os-greeter.xgreeters;
130+ name = "pantheon-greeter";
151131 };
152132
153133 greeters = {
pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix+20−21
@@ -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; {
pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patchnew file+24
@@ -0,0 +1,24 @@
1+diff --git a/greeter/CMakeLists.txt b/greeter/CMakeLists.txt
2+index 57aebb0..ab50bff 100644
3+--- a/greeter/CMakeLists.txt
4++++ b/greeter/CMakeLists.txt
5+@@ -9,7 +9,6 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
6+ set (CONF_DIR "/etc/lightdm")
7+ set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
8+ set (PKGDATADIR "${DATADIR}/enso/greeter")
9+-set (CMAKE_INSTALL_PREFIX /usr)
10+ set (VERSION "1.0.6")
11+
12+
13+@@ -94,9 +93,9 @@ glib_compile_resources (GLIB_RESOURCES_CSS SOURCE data/css.gresource.xml)
14+ add_executable (pantheon-greeter ${VALA_C} ${GLIB_RESOURCES_CSS})
15+ target_link_libraries(pantheon-greeter m)
16+
17+-install (TARGETS pantheon-greeter RUNTIME DESTINATION sbin)
18++install (TARGETS pantheon-greeter RUNTIME DESTINATION bin)
19+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.desktop DESTINATION share/xgreeters)
20+-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/greeter.conf DESTINATION ${CONF_DIR})
21++install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/greeter.conf DESTINATION etc/lightdm)
22+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/fingerprint.svg DESTINATION ${PKGDATADIR})
23+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/power.svg DESTINATION ${PKGDATADIR})
24+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/checked.svg DESTINATION ${PKGDATADIR})