Skip to content

buildFHSChrootEnv: link gsettings-schemas to FHS location #83705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
worldofpeace wants to merge 3 commits into from
Closed

buildFHSChrootEnv: link gsettings-schemas to FHS location #83705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b08e5d
buildFHSChrootEnv: link gsettings-schemas to FHS location
worldofpeace Mar 29, 2020
f5ff64c
fixup! buildFHSChrootEnv: link gsettings-schemas to FHS location
worldofpeace Mar 29, 2020
35faf0a
doc/fhs-environments: note that you don't need wrapGAppsHook
worldofpeace Mar 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions doc/builders/special/fhs-environments.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,8 @@
<para>
Running <literal>nix-shell</literal> would then drop you into a shell with these libraries and binaries available. You can use this to run closed-source applications which expect FHS structure without hassles: simply change <literal>runScript</literal> to the application path, e.g. <filename>./bin/start.sh</filename> -- relative paths are supported.
</para>

<para>
Additonally, the FHS builder links all relocated gsettings-schemas (the glib setup-hook moves them to share/gsettings-schemas/${name}/glib-2.0/schemas) to their standard FHS location. This means you don't need to wrap binaries with <literal>wrapGAppsHook</literal>.
</para>
</section>
19 changes: 19 additions & 0 deletions pkgs/build-support/build-fhs-userenv/env.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,25 @@ let
paths = [ etcPkg ] ++ basePkgs ++ targetPaths;
extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall;
ignoreCollisions = true;
postBuild = ''
if [[ -d $out/share/gsettings-schemas/ ]]; then
# Create the standard schemas directory if needed
if [[ -L $out/share/glib-2.0 ]]; then
rm -rf $out/share/glib-2.0
Copy link
Member

@jtojnar jtojnar May 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am still not totally comfortable with removing the link. At the moment, I cannot think of a case where it would be destructive but conditions change.

Could we try to make the tree writeable like lndir does?

Copy link
Contributor

@asymmetric asymmetric Jun 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jtojnar could you point me to the lndir package you're referring to?

Copy link
Member

@jtojnar jtojnar Jun 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is in xorg.lndir.

Copy link
Contributor

@asymmetric asymmetric Jun 17, 2020 •
edited by jtojnar
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jtojnar I don't see anything relevant here

Copy link
Member

@jtojnar jtojnar Jun 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant the lndir program, not the expression.

Copy link
Member

@Artturin Artturin Feb 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#161739

mkdir -p $out/share/glib-2.0/schemas
fi

# symlink any schema files or overrides to the standard schema directory
for d in $out/share/gsettings-schemas/*; do
# Force symlink, in case there are duplicates
ln -fs $d/glib-2.0/schemas/*.xml $out/share/glib-2.0/schemas
ln -fs $d/glib-2.0/schemas/*.gschema.override $out/share/glib-2.0/schemas
done

# and compile them
${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
fi
'';
};

staticUsrProfileMulti = buildEnv {
Expand Down