diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 16:01:12 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 16:01:12 +0000 |
| commit | 9ee0a9df9bc69e72278b8d34093238428fa3ea82 (patch) | |
| tree | 5b074e2ebbc2aba8c957753bfb9e549ed7689585 /pkgs/applications/networking/p2p | |
| parent | 0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b (diff) | |
| parent | 47288a22242b0cd554efc45d446e67573ca308f7 (diff) | |
| download | nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.gz nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.bz2 nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.lz nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.xz nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.zst nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.zip | |
svn merge ^/nixpkgs/trunk
A few trivial conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
Diffstat (limited to 'pkgs/applications/networking/p2p')
| -rw-r--r-- | pkgs/applications/networking/p2p/valknut/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/p2p/valknut/default.nix b/pkgs/applications/networking/p2p/valknut/default.nix index 994f6b44f943..2290cf523147 100644 --- a/pkgs/applications/networking/p2p/valknut/default.nix +++ b/pkgs/applications/networking/p2p/valknut/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, x11, libxml2, libjpeg, libpng, openssl, qt, dclib}: +{stdenv, fetchurl, perl, x11, libxml2, libjpeg, libpng, openssl, qt3, dclib}: stdenv.mkDerivation { name = "valknut-0.3.7"; @@ -9,6 +9,6 @@ stdenv.mkDerivation { md5 = "848f9b3f25af15c3f1837133ac4b9415"; }; - buildInputs = [perl x11 libxml2 libjpeg libpng openssl qt dclib]; + buildInputs = [perl x11 libxml2 libjpeg libpng openssl qt3 dclib]; inherit openssl; } |