Merge pull request #65237 from worldofpeace/dont-multiout-demos

[staging-next] gtk3: don't multiout demos
This commit is contained in:
worldofpeace 2019-07-22 12:27:54 -04:00 committed by GitHub
commit da6101d141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -154,17 +154,13 @@ stdenv.mkDerivation rec {
done
'';
# Make all demo related things in dev
postFixup = ''
moveToOutput share/icons/hicolor "$dev"
moveToOutput share/applications "$dev"
moveToOutput share/gsettings-schemas "$dev"
# Wrap demos
postFixup = optionalString (!stdenv.isDarwin) ''
demos=(gtk3-demo gtk3-demo-application gtk3-icon-browser gtk3-widget-factory)
for program in ''${demos[@]}; do
wrapProgram $dev/bin/$program \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$dev/share/gsettings-schemas/${pname}-${version}"
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}"
done
'';