mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 17:33:09 +00:00
Merge pull request #299276 from K900/ecm-hook-chop
kdePackages.extra-cmake-modules: chop off some of the setup hook
This commit is contained in:
commit
2f4ac5c209
@ -69,10 +69,7 @@ ecmPostHook() {
|
|||||||
}
|
}
|
||||||
postHooks+=(ecmPostHook)
|
postHooks+=(ecmPostHook)
|
||||||
|
|
||||||
xdgDataSubdirs=( \
|
xdgDataSubdirs=("config.kcfg" "kconf_update" "knotifications6" "icons" "locale" "mime")
|
||||||
"config.kcfg" "kconf_update" "knotifications6" "icons" "locale" "sounds" "templates" \
|
|
||||||
"wallpapers" "applications" "desktop-directories" "mime" "appdata" "dbus-1" \
|
|
||||||
)
|
|
||||||
|
|
||||||
# ecmHostPathsSeen is an associative array of the paths that have already been
|
# ecmHostPathsSeen is an associative array of the paths that have already been
|
||||||
# seen by ecmHostPathHook.
|
# seen by ecmHostPathHook.
|
||||||
@ -108,19 +105,7 @@ ecmHostPathHook() {
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
local manDir="$1/man"
|
if [ -d "$1/share/dbus-1" ]
|
||||||
if [ -d "$manDir" ]
|
|
||||||
then
|
|
||||||
qtWrapperArgs+=(--prefix MANPATH : "$manDir")
|
|
||||||
fi
|
|
||||||
|
|
||||||
local infoDir="$1/info"
|
|
||||||
if [ -d "$infoDir" ]
|
|
||||||
then
|
|
||||||
qtWrapperArgs+=(--prefix INFOPATH : "$infoDir")
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -d "$1/dbus-1" ]
|
|
||||||
then
|
then
|
||||||
propagatedUserEnvPkgs+=" $1"
|
propagatedUserEnvPkgs+=" $1"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user