diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-20 20:13:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-20 20:24:47 +0200 |
| commit | d24b3aec91b7c65301d7a24a5124ea9a0c38b588 (patch) | |
| tree | 1559ebef8e7cb0602cb49057f48cd2c791fc0c02 /pkgs/development/libraries/gtk+ | |
| parent | 6b8a8ca59f4b48669a6954c8ec2aca73ec17942f (diff) | |
| download | nixpkgs-d24b3aec91b7c65301d7a24a5124ea9a0c38b588.tar nixpkgs-d24b3aec91b7c65301d7a24a5124ea9a0c38b588.tar.gz nixpkgs-d24b3aec91b7c65301d7a24a5124ea9a0c38b588.tar.bz2 nixpkgs-d24b3aec91b7c65301d7a24a5124ea9a0c38b588.tar.lz nixpkgs-d24b3aec91b7c65301d7a24a5124ea9a0c38b588.tar.xz nixpkgs-d24b3aec91b7c65301d7a24a5124ea9a0c38b588.tar.zst nixpkgs-d24b3aec91b7c65301d7a24a5124ea9a0c38b588.zip | |
gtk2: fixup splitting
I forgot these changes were needed to make it build. Leaving gtk3 and gnome stuff after 3.16.
Diffstat (limited to 'pkgs/development/libraries/gtk+')
| -rw-r--r-- | pkgs/development/libraries/gtk+/2.x.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk+/setup-hook.sh | 10 |
2 files changed, 19 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 16691e8588c..41dab3ad2df 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -15,13 +15,16 @@ stdenv.mkDerivation rec { sha256 = "1x14rnjvqslpa1q19fp1qalz5sxds72amsgjk8m7769rwk511jr0"; }; - outputs = [ "dev" "out" "bin" "doc" ]; + outputs = [ "dev" "out" "doc" ]; + outputBin = "dev"; enableParallelBuilding = true; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (libintlOrEmpty != []) "-lintl"; - nativeBuildInputs = [ perl pkgconfig gettext ]; + setupHook = ./setup-hook.sh; + + nativeBuildInputs = [ setupHook perl pkgconfig gettext ]; propagatedBuildInputs = with xlibs; with stdenv.lib; [ glib cairo pango gdk_pixbuf atk ] @@ -37,6 +40,10 @@ stdenv.mkDerivation rec { then "--disable-glibtest --disable-introspection --disable-visibility" else "--with-xinput=yes"; + postInstall = '' + _moveToOutput share/gtk-2.0/demo "$doc" + ''; + passthru = { gtkExeEnvPostBuild = '' rm $out/lib/gtk-2.0/2.10.0/immodules.cache diff --git a/pkgs/development/libraries/gtk+/setup-hook.sh b/pkgs/development/libraries/gtk+/setup-hook.sh new file mode 100644 index 00000000000..c2b0ab502db --- /dev/null +++ b/pkgs/development/libraries/gtk+/setup-hook.sh @@ -0,0 +1,10 @@ +fixupOutputHooks+=(_gtk2CleanComments) + +# Clean comments that link to generator of the file +_gtk2CleanComments() { + local f="$prefix/lib/gtk-2.0/2.10.0/immodules.cache" + if [ -f "$f" ]; then + sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f" + fi +} + |