diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-19 18:24:24 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-19 18:24:24 +0200 |
| commit | 8213ff161c461655aaff7d43984384dbca64b312 (patch) | |
| tree | 3b7c3138ff2222b9b6b8d247c3b1a0c8ea3305e3 /pkgs/applications/misc/terminus | |
| parent | 9f208b5d8aa10518eb92ed5b7d77e4a588b5154c (diff) | |
| parent | e7e5aaa0b938ed53dd96f58c8ebf9e0f7f72e133 (diff) | |
| download | nixpkgs-8213ff161c461655aaff7d43984384dbca64b312.tar nixpkgs-8213ff161c461655aaff7d43984384dbca64b312.tar.gz nixpkgs-8213ff161c461655aaff7d43984384dbca64b312.tar.bz2 nixpkgs-8213ff161c461655aaff7d43984384dbca64b312.tar.lz nixpkgs-8213ff161c461655aaff7d43984384dbca64b312.tar.xz nixpkgs-8213ff161c461655aaff7d43984384dbca64b312.tar.zst nixpkgs-8213ff161c461655aaff7d43984384dbca64b312.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/misc/terminus')
| -rw-r--r-- | pkgs/applications/misc/terminus/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix index f76f7035662..2f7f90e580d 100644 --- a/pkgs/applications/misc/terminus/default.nix +++ b/pkgs/applications/misc/terminus/default.nix @@ -1,14 +1,15 @@ -{ stdenv, lib, fetchurl, dpkg, gnome2, gtk2, atk, glib, pango, gdk_pixbuf, cairo +{ stdenv, lib, fetchurl, dpkg, gnome3, gtk2, atk, glib, pango, gdk_pixbuf, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libxcb, makeWrapper, nodejs -, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: +, nss, nspr, alsaLib, cups, expat, systemd, libpulseaudio }: +# FIXME: gnome3.gconf was unavailable when merging master into staging-next let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat libudev libpulseaudio + libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat systemd libpulseaudio ]; in stdenv.mkDerivation rec { |