Author: urkud
Date: Sat Jan 7 17:06:57 2012
New Revision: 31407
URL: https://nixos.org/websvn/nix/?rev=31407&sc=1
Log:
-kde3.kuickshow, +kde4.kuickshow
Modified:
nixpkgs/trunk/pkgs/applications/graphics/kuickshow/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/graphics/kuickshow/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/graphics/kuickshow/default.nix Sat Jan
7 17:06:49 2012 (r31406)
+++ nixpkgs/trunk/pkgs/applications/graphics/kuickshow/default.nix Sat Jan
7 17:06:57 2012 (r31407)
@@ -1,23 +1,14 @@
-{stdenv, fetchurl, libX11, libXext, libSM, kdelibs, qt3, libjpeg, libungif,
libpng, libtiff, imlib, arts, expat, perl}:
+{ stdenv, fetchurl, kdelibs, imlib, cmake, pkgconfig, gettext }:
-stdenv.mkDerivation {
- name = "kuickshow-0.8.5";
- builder = ./builder.sh;
+stdenv.mkDerivation rec {
+ name = "kuickshow-0.9.1";
src = fetchurl {
- url = mirror://sourceforge/kuickshow/kuickshow-0.8.5.tgz;
- md5 = "7a95852a0670b18859a1e6789b256ebd";
+ url = "http://hosti.leonde.de/~gis/${name}.tar.bz2";;
+ sha256 = "0l488a6p0ligbhv6p1lnx5k2d00x9bkkvms30winifa8rmisa9wl";
};
- configureFlags = "
- --with-imlib-config=${imlib}/bin
- --with-extra-includes=${libjpeg}/include
- --with-extra-libs=${libjpeg}/lib
- --x-includes=${libX11}/include
- --x-libraries=${libX11}/lib";
+ buildInputs = [ kdelibs imlib ];
- buildInputs = [kdelibs libX11 libXext libSM qt3 libjpeg libungif libpng
libtiff imlib arts expat perl];
- inherit libjpeg;
-
- KDEDIR = kdelibs;
+ buildNativeInputs = [ cmake gettext pkgconfig ];
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 7 17:06:49
2012 (r31406)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 7 17:06:57
2012 (r31407)
@@ -8019,10 +8019,6 @@
stdenv = overrideGCC stdenv gcc42; # I'm to lazy to clean up header files
};
- kuickshow = callPackage ../applications/graphics/kuickshow {
- inherit (kde3) arts kdelibs;
- };
-
};
kde4 = recurseIntoAttrs pkgs.kde47;
@@ -8101,6 +8097,8 @@
ktorrent = callPackage ../applications/networking/p2p/ktorrent { };
+ kuickshow = callPackage ../applications/graphics/kuickshow { };
+
libktorrent = callPackage ../development/libraries/libktorrent { };
libkvkontakte = callPackage ../development/libraries/libkvkontakte { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
