diff options
author | gnidorah <gnidorah@users.noreply.github.com> | 2017-11-30 10:04:57 +0300 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2017-12-04 17:32:11 +0100 |
commit | a9746ab83965775ffb773eea403ef9d23720e5fd (patch) | |
tree | 3951638e3154185239169631d2a48c5bd874c87e /pkgs/applications/networking/p2p/transmission/default.nix | |
parent | 81e5b51a2c1a8730d5a3a986788669bebd4bd298 (diff) | |
download | nixpkgs-a9746ab83965775ffb773eea403ef9d23720e5fd.tar nixpkgs-a9746ab83965775ffb773eea403ef9d23720e5fd.tar.gz nixpkgs-a9746ab83965775ffb773eea403ef9d23720e5fd.tar.bz2 nixpkgs-a9746ab83965775ffb773eea403ef9d23720e5fd.tar.lz nixpkgs-a9746ab83965775ffb773eea403ef9d23720e5fd.tar.xz nixpkgs-a9746ab83965775ffb773eea403ef9d23720e5fd.tar.zst nixpkgs-a9746ab83965775ffb773eea403ef9d23720e5fd.zip |
transmission_gtk: use wrapGAppsHook
Diffstat (limited to 'pkgs/applications/networking/p2p/transmission/default.nix')
-rw-r--r-- | pkgs/applications/networking/p2p/transmission/default.nix | 11 |
1 files 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"; |