diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-02-13 22:47:50 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-02-14 02:31:15 +0100 |
| commit | 606ceda352de9830cc5e01c169571e742d88fb15 (patch) | |
| tree | cbd513b0d2a7402d9aa9f83fa6c80597d2e55cb0 /pkgs/desktops/gnome-3/core/gnome-user-share | |
| parent | e27fa435f7dd15506e96ee6b794b447998e77997 (diff) | |
| download | nixpkgs-606ceda352de9830cc5e01c169571e742d88fb15.tar nixpkgs-606ceda352de9830cc5e01c169571e742d88fb15.tar.gz nixpkgs-606ceda352de9830cc5e01c169571e742d88fb15.tar.bz2 nixpkgs-606ceda352de9830cc5e01c169571e742d88fb15.tar.lz nixpkgs-606ceda352de9830cc5e01c169571e742d88fb15.tar.xz nixpkgs-606ceda352de9830cc5e01c169571e742d88fb15.tar.zst nixpkgs-606ceda352de9830cc5e01c169571e742d88fb15.zip | |
gnome3: stop using aliases
Diffstat (limited to 'pkgs/desktops/gnome-3/core/gnome-user-share')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-user-share/default.nix | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 6a5d2fde501..134ba41d653 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, apacheHttpd, nautilus -, pkgconfig, gtk3, glib, libxml2, systemd +, pkgconfig, gtk3, glib, libxml2, systemd, adwaita-icon-theme , wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd , gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; preConfigure = '' sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ @@ -26,15 +26,19 @@ stdenv.mkDerivation rec { -i data/dav_user_2.4.conf ''; - configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd" - "--with-modules-path=${apacheHttpd.dev}/modules" - "--with-systemduserunitdir=$(out)/etc/systemd/user" - "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; + configureFlags = [ + "--with-httpd=${apacheHttpd.out}/bin/httpd" + "--with-modules-path=${apacheHttpd.dev}/modules" + "--with-systemduserunitdir=$(out)/etc/systemd/user" + "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" + ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool libxml2 libtool - wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg - nautilus libnotify libcanberra-gtk3 systemd ]; + buildInputs = [ + gtk3 glib intltool itstool libxml2 libtool + wrapGAppsHook file gdk_pixbuf adwaita-icon-theme librsvg + nautilus libnotify libcanberra-gtk3 systemd + ]; postInstall = '' mkdir -p $out/share/gsettings-schemas/$name |