about summary refs log tree commit diff
path: root/pkgs/applications/networking/p2p/transmission
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2013-02-27 13:05:21 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2013-02-27 13:45:41 +0100
commit586a93178e523efe01f0fcd75cd8632f0c45063c (patch)
tree2d2e73284fb2736205d34d43d0d7fd9abee4586a /pkgs/applications/networking/p2p/transmission
parent566d5d3fb5497b1bd466bcb8c2bc24678240be87 (diff)
downloadnixlib-586a93178e523efe01f0fcd75cd8632f0c45063c.tar
nixlib-586a93178e523efe01f0fcd75cd8632f0c45063c.tar.gz
nixlib-586a93178e523efe01f0fcd75cd8632f0c45063c.tar.bz2
nixlib-586a93178e523efe01f0fcd75cd8632f0c45063c.tar.lz
nixlib-586a93178e523efe01f0fcd75cd8632f0c45063c.tar.xz
nixlib-586a93178e523efe01f0fcd75cd8632f0c45063c.tar.zst
nixlib-586a93178e523efe01f0fcd75cd8632f0c45063c.zip
transmission: bump from 2.52 to 2.60
2.60 is the newest of the gtk2-compatible versions. (Transmission >=
2.61 requires gtk3.)

* Add inotify as input to not have transmission-daemon poll the torrent
  auto-load directory.
* Add file as input to fix a small build time issue (non-fatal).
* Remove unneeded gtk configure flags (support is auto-detected).
* icon-theme.cache is only generated when building with gtk, so use
  rm -f to not error out when building without gtk.
* Use gtk ? null instead of gtkClient flag because it is simpler.

Build and runtime tested with and without gtk support.
Diffstat (limited to 'pkgs/applications/networking/p2p/transmission')
-rw-r--r--pkgs/applications/networking/p2p/transmission/default.nix17
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 0a86e140347d..c59fddf6364b 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -1,20 +1,23 @@
-{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent, gtkClient ? true, gtk }:
+{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent,
+  file, inotifyTools, gtk ? null }:
 
 stdenv.mkDerivation rec {
-  name = "transmission-2.52";
+  name = "transmission-2.60"; # transmission >= 2.61 requires gtk3
 
   src = fetchurl {
     url = "http://download.transmissionbt.com/files/${name}.tar.xz";
-    sha256 = "05sfq5h3731xc9a1k5r1q4gbs9yk0dr229asfxjjgg0lw1xzppdw";
+    sha256 = "1ramdliyy8j7qqpkxg643lda11ynxwfhq6qcs31fr3h9x72l0rg4";
   };
 
-  buildInputs = [ pkgconfig openssl curl intltool libevent ] ++
-                stdenv.lib.optional gtkClient gtk;
+  buildInputs = [ pkgconfig openssl curl intltool libevent
+                  file inotifyTools gtk ];
 
-  configureFlags = if gtkClient then "--enable-gtk" else "--disable-gtk";
+  preConfigure = ''
+    sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure
+  '';
 
   postInstall = ''
-    rm $out/share/icons/hicolor/icon-theme.cache
+    rm -f $out/share/icons/hicolor/icon-theme.cache
   '';
 
   meta = {