diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-01-20 12:37:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-20 12:37:53 +0100 |
| commit | c622d7d77aa3a45ef0fcdf75be3946e9ce51a646 (patch) | |
| tree | bb0fe346c159d40578de07f2aac115232569b7f6 /pkgs/development/compilers | |
| parent | 547efe3118c5c77d600f42effd7be108013e0729 (diff) | |
| parent | 79ca7f4cb4ab0842fd31ea3c1acfcb6f7baae55e (diff) | |
| download | nixlib-c622d7d77aa3a45ef0fcdf75be3946e9ce51a646.tar nixlib-c622d7d77aa3a45ef0fcdf75be3946e9ce51a646.tar.gz nixlib-c622d7d77aa3a45ef0fcdf75be3946e9ce51a646.tar.bz2 nixlib-c622d7d77aa3a45ef0fcdf75be3946e9ce51a646.tar.lz nixlib-c622d7d77aa3a45ef0fcdf75be3946e9ce51a646.tar.xz nixlib-c622d7d77aa3a45ef0fcdf75be3946e9ce51a646.tar.zst nixlib-c622d7d77aa3a45ef0fcdf75be3946e9ce51a646.zip | |
Merge pull request #54324 from jtojnar/vapi-setup-hook
Vapi setup hook
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/vala/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/compilers/vala/setup-hook.sh | 15 |
2 files changed, 21 insertions, 1 deletions
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 5f21399229a5..d94437b6a167 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, automake, autoreconfHook -, graphviz, glib, libiconv, libintl, libtool, expat +, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll }: let @@ -45,6 +45,11 @@ let name = "vala-${version}"; version = "${major}.${minor}"; + setupHook = substituteAll { + src = ./setup-hook.sh; + apiVersion = major; + }; + src = fetchurl { url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; inherit sha256; diff --git a/pkgs/development/compilers/vala/setup-hook.sh b/pkgs/development/compilers/vala/setup-hook.sh new file mode 100644 index 000000000000..8252143e998b --- /dev/null +++ b/pkgs/development/compilers/vala/setup-hook.sh @@ -0,0 +1,15 @@ +make_vala_find_vapi_files() { + # XDG_DATA_DIRS: required for finding .vapi files + if [ -d "$1/share/vala/vapi" -o -d "$1/share/vala-@apiVersion@/vapi" ]; then + addToSearchPath XDG_DATA_DIRS $1/share + fi +} + +addEnvHooks "$hostOffset" make_vala_find_vapi_files + +_multioutMoveVapiDirs() { + moveToOutput share/vala/vapi "${!outputDev}" + moveToOutput share/vala-@apiVersion@/vapi "${!outputDev}" +} + +preFixupHooks+=(_multioutMoveVapiDirs) |