From 8438e3e67f05f2600e2def07f5cc58ae214b6267 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 21 Jul 2019 15:04:45 -0400 Subject: [PATCH] gtk3: don't multiout demos --- pkgs/development/libraries/gtk+/3.x.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 8c3df083087..d814bb58fbc 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -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 '';