diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-11-06 11:13:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-06 11:13:08 +0000 |
| commit | f6501c42cdf723d8c2c50aef5b96cc54826ae18f (patch) | |
| tree | 14aad38ec2fe64f4a0eed9b70258c8900299c34f /pkgs | |
| parent | b69a51a08bc3a5e84d89fbe79d033049fb66ab4e (diff) | |
| parent | bc8ef6c3ff8ca5339d4adf7ad90ea523be7a763d (diff) | |
| download | nixpkgs-f6501c42cdf723d8c2c50aef5b96cc54826ae18f.tar nixpkgs-f6501c42cdf723d8c2c50aef5b96cc54826ae18f.tar.gz nixpkgs-f6501c42cdf723d8c2c50aef5b96cc54826ae18f.tar.bz2 nixpkgs-f6501c42cdf723d8c2c50aef5b96cc54826ae18f.tar.lz nixpkgs-f6501c42cdf723d8c2c50aef5b96cc54826ae18f.tar.xz nixpkgs-f6501c42cdf723d8c2c50aef5b96cc54826ae18f.tar.zst nixpkgs-f6501c42cdf723d8c2c50aef5b96cc54826ae18f.zip | |
Merge pull request #72872 from marsam/enable-librsvg-emacs-darwin
emacs: also allow librsvg dependency when using withNS
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 29a6a8773ef..2862ba7184f 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -60,9 +60,9 @@ stdenv.mkDerivation rec { [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ] ++ lib.optionals withX - [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft + [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff libXft gconf ] - ++ lib.optionals (withX || withNS) [ imagemagick ] + ++ lib.optionals (withX || withNS) [ imagemagick librsvg ] ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2-x11 ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] |