From 0c402c605699bd95cd1093d12616c1e52108cd0f Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 30 Nov 2017 10:04:57 +0300 Subject: [PATCH 1/3] transmission_gtk: use wrapGAppsHook --- .../networking/p2p/transmission/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 9b448f86736..d2bbef7f581 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper +{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook , openssl, curl, libevent, inotify-tools, systemd, zlib , enableGTK3 ? false, gtk3 , enableSystemd ? stdenv.isLinux @@ -20,9 +20,10 @@ stdenv.mkDerivation rec { sha256 = "0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] + ++ optionals enableGTK3 [ wrapGAppsHook ]; buildInputs = [ intltool file openssl curl libevent zlib ] - ++ optionals enableGTK3 [ gtk3 makeWrapper ] + ++ optionals enableGTK3 [ gtk3 ] ++ optionals enableSystemd [ systemd ] ++ optionals stdenv.isLinux [ inotify-tools ]; @@ -41,10 +42,8 @@ stdenv.mkDerivation rec { ++ optional enableSystemd "--with-systemd-daemon" ++ optional enableGTK3 "--with-gtk"; - preFixup = optionalString enableGTK3 /* gsettings schemas for file dialogues */ '' + preFixup = optionalString enableGTK3 '' rm "$out/share/icons/hicolor/icon-theme.cache" - wrapProgram "$out/bin/transmission-gtk" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation"; From f423efb7f5388424d47d56e255bd3ef609530157 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 30 Nov 2017 10:10:09 +0300 Subject: [PATCH 2/3] libreoffice: use wrapGAppsHook --- pkgs/applications/office/libreoffice/default.nix | 11 ++++------- pkgs/applications/office/libreoffice/still.nix | 11 ++++------- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 830ae68fd1b..cd59f78b6c6 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -11,7 +11,7 @@ , fontsConf, pkgconfig, libzip, bluez5, libtool, maven , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 -, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas +, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ] , withHelp ? true @@ -166,10 +166,6 @@ in stdenv.mkDerivation rec { for a in sbase scalc sdraw smath swriter simpress soffice; do ln -s $out/lib/libreoffice/program/$a $out/bin/$a - wrapProgram "$out/bin/$a" \ - --prefix XDG_DATA_DIRS : \ - "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - ; done ln -s $out/bin/soffice $out/bin/libreoffice @@ -252,16 +248,17 @@ in stdenv.mkDerivation rec { libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer - gst_all_1.gst-plugins-base gsettings_desktop_schemas glib + gst_all_1.gst-plugins-base glib neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libzmf libtool libxshmfence libatomic_ops graphite2 harfbuzz gpgme librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy - libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper + libodfgen CoinMP librdf_rasqal defaultIconTheme gdb ] ++ lib.optional kdeIntegration kdelibs4; + nativeBuildInputs = [ wrapGAppsHook ]; passthru = { inherit srcs; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index a3991b8b35c..42d8abf49bd 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -11,7 +11,7 @@ , fontsConf, pkgconfig, libzip, bluez5, libtool, maven , libatomic_ops, graphite2, harfbuzz, libodfgen , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 -, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas +, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , defaultIconTheme, glib, ncurses , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ] , withHelp ? true @@ -162,10 +162,6 @@ in stdenv.mkDerivation rec { for a in sbase scalc sdraw smath swriter simpress soffice; do ln -s $out/lib/libreoffice/program/$a $out/bin/$a - wrapProgram "$out/bin/$a" \ - --prefix XDG_DATA_DIRS : \ - "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - ; done ln -s $out/bin/soffice $out/bin/libreoffice @@ -247,15 +243,16 @@ in stdenv.mkDerivation rec { libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer - gst_all_1.gst-plugins-base gsettings_desktop_schemas glib + gst_all_1.gst-plugins-base glib neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz librevenge libe-book libmwaw glm glew ncurses - libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper + libodfgen CoinMP librdf_rasqal defaultIconTheme ] ++ lib.optional kdeIntegration kdelibs4; + nativeBuildInputs = [ wrapGAppsHook ]; passthru = { inherit srcs; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1c1cb52637..691c79b2aed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15555,7 +15555,7 @@ with pkgs; libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) gsettings_desktop_schemas defaultIconTheme; + inherit (gnome3) defaultIconTheme; zip = zip.override { enableNLS = false; }; bluez5 = bluez5_28; fontsConf = makeFontsConf { @@ -15575,7 +15575,7 @@ with pkgs; libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) gsettings_desktop_schemas defaultIconTheme; + inherit (gnome3) defaultIconTheme; zip = zip.override { enableNLS = false; }; #glm = glm_0954; bluez5 = bluez5_28; From a06871ab564e2b957f3e788f961eb350e5dff7b4 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 30 Nov 2017 21:00:18 +0300 Subject: [PATCH 3/3] gnome3.dconf-editor: drop gnome3.gsettings_desktop_schemas --- pkgs/desktops/gnome-3/core/dconf-editor/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 62ccb636034..bf39965bf77 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme - gnome3.gsettings_desktop_schemas intltool docbook_xsl docbook_xsl_ns gnome3.dconf ]; meta = with stdenv.lib; {