diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
commit | 5b132f6e96a9794018ae1c085da482b381d1e039 (patch) | |
tree | ff54ae514799540c093adcfeca0d501b75cde506 /pkgs/applications/networking/newsreaders/kwooty | |
parent | f878980c8b78a639b3feabd1f8f9ed9f1b7c388c (diff) | |
parent | d9de74edd67f7dc31f5297bc785712afb322dbdd (diff) |
svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
Diffstat (limited to 'pkgs/applications/networking/newsreaders/kwooty')
-rw-r--r-- | pkgs/applications/networking/newsreaders/kwooty/default.nix | 38 | ||||
-rw-r--r-- | pkgs/applications/networking/newsreaders/kwooty/searchPath.patch | 19 |
2 files changed, 57 insertions, 0 deletions
diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix new file mode 100644 index 0000000000000..4d68191c6f212 --- /dev/null +++ b/pkgs/applications/networking/newsreaders/kwooty/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, gcc, cmake, qt4, gettext +, kdelibs, kdebase_workspace, perl +, openssl, phonon, automoc4 +, libX11, libXext, libXft +, unrar, p7zip, par2cmdline, coreutils +}: + +let version = "0.8.0"; + name = "kwooty-${version}"; +in stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "mirror://sourceforge/kwooty/${name}.tar.gz"; + sha256 = "bb50fb9b3d6c973f2abee62cfc11a7086900a4b676c12bf4e0a2adc170a977fc"; + }; + + patches = [ ./searchPath.patch ]; + + postPatch = '' + echo "Changing paths to archive utilities to the nix store"; + substituteInPlace "src/utility.cpp" \ + --replace "/usr/bin/unrar" "${unrar}/bin" \ + --replace "/usr/bin/unpar" "${par2cmdline}/bin" \ + --replace "/usr/bin/7z" "${p7zip}/bin" \ + --replace "/usr/bin/nice" "${coreutils}/bin/nice" + ''; + + buildInputs = + [ gcc perl cmake qt4 gettext automoc4 openssl + kdelibs kdebase_workspace phonon + libX11 libXext libXft + ]; + + meta = with stdenv.lib; { + description = "Binary news reader for KDE"; + }; +} diff --git a/pkgs/applications/networking/newsreaders/kwooty/searchPath.patch b/pkgs/applications/networking/newsreaders/kwooty/searchPath.patch new file mode 100644 index 0000000000000..602002d0173f0 --- /dev/null +++ b/pkgs/applications/networking/newsreaders/kwooty/searchPath.patch @@ -0,0 +1,19 @@ +--- kwooty-kwooty/src/utility.cpp 2012-01-24 22:22:45.091383072 +0100 ++++ kwooty-kwooty/src/utility.cpp 2012-01-24 22:29:08.526208140 +0100 +@@ -299,6 +299,7 @@ + + QString programPathName; + QStringList searchPathList = Settings::searchPathList(); ++ searchPathList << "/usr/bin/unpar" << "/usr/bin/unrar" << "/usr/bin/7z"; + + QStringList programsWithDifferentNames = programToSearch.split(";"); + +@@ -363,7 +364,7 @@ + QStringList niceProcessArgs; + + // look for 'nice' location : +- QString nicePath = KStandardDirs::findExe("nice"); ++ QString nicePath = QString("/usr/bin/nice"); + niceProcessArgs.append(nicePath); + niceProcessArgs.append("-n"); + |