diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-24 07:58:04 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-25 19:04:24 -0500 |
| commit | 160bf21b3a97c1d7fb4281c4d55efad06149ae2f (patch) | |
| tree | 80122d6402799dc4d107b8f053f368277f877feb | |
| parent | 6a64edfa0e38b599ee15f7582d3dbe62b2b884af (diff) | |
| download | nixpkgs-160bf21b3a97c1d7fb4281c4d55efad06149ae2f.tar nixpkgs-160bf21b3a97c1d7fb4281c4d55efad06149ae2f.tar.gz nixpkgs-160bf21b3a97c1d7fb4281c4d55efad06149ae2f.tar.bz2 nixpkgs-160bf21b3a97c1d7fb4281c4d55efad06149ae2f.tar.lz nixpkgs-160bf21b3a97c1d7fb4281c4d55efad06149ae2f.tar.xz nixpkgs-160bf21b3a97c1d7fb4281c4d55efad06149ae2f.tar.zst nixpkgs-160bf21b3a97c1d7fb4281c4d55efad06149ae2f.zip | |
librsvg: multiple outputs
| -rw-r--r-- | pkgs/development/libraries/librsvg/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/inputmethods/ibus/wrapper.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 0768a21bf54..6147e847b33 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + outputs = [ "dev" "out" ]; + buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ] ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index 632f46f81e9..690043791b2 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -23,7 +23,7 @@ let for prog in ibus ibus-daemon ibus-setup; do wrapProgram "$out/bin/$prog" \ - --prefix GDK_PIXBUF_MODULE_FILE : ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ + --prefix GDK_PIXBUF_MODULE_FILE : ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ |