public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add rsibreak

Browse Source 
svn path=/nixpkgs/trunk/; revision=22897
This commit is contained in:
Yury G. Kudryashov 2010-08-02 17:19:44 +00:00
parent 230c31d020
commit dea41a12ea
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/misc/rsibreak/default.nix Normal file
View File

@ -0,0 +1,12 @@
{ stdenv, fetchurl, cmake, kdelibs, kdebase_workspace }:
stdenv.mkDerivation rec {
name = "rsibreak-0.10";
src = fetchurl {
url = "http://www.rsibreak.org/files/${name}.tar.bz2";
sha256 = "02vvwmzhvc9jfrzmnfn3cygx63yx7g360lcslwj1vikzkg834ik0";
};
buildInputs = [ cmake kdelibs kdebase_workspace ];
}

16
pkgs/top-level/all-packages.nix
View File

@ -5980,7 +5980,20 @@ let
inherit (kde4) qt4 kdelibs automoc4 phonon; inherit (kde4) qt4 kdelibs automoc4 phonon;
}; };
<<<<<<< HEAD
rsync = callPackage ../applications/networking/sync/rsync { rsync = callPackage ../applications/networking/sync/rsync {
||||||| merged common ancestors
rsync = import ../applications/networking/sync/rsync {
inherit fetchurl stdenv acl perl;
=======
rsibreak = makeOverridable (import ../applications/misc/rsibreak) {
inherit fetchurl stdenv cmake;
inherit (kde4) kdelibs kdebase_workspace;
};
rsync = import ../applications/networking/sync/rsync {
inherit fetchurl stdenv acl perl;
>>>>>>> Add rsibreak
enableACLs = !stdenv.isDarwin; enableACLs = !stdenv.isDarwin;
}; };
@ -6580,6 +6593,9 @@ let
}); });
kde45 = makeOverridable (import ../desktops/kde-4.5) (pkgs // { kde45 = makeOverridable (import ../desktops/kde-4.5) (pkgs // {
qt4 = qt47;
pyqt4 = pyqt4.override { qt4 = qt47; };
libdbusmenu_qt = libdbusmenu_qt.override { qt4 = qt47; };
shared_desktop_ontologies = shared_desktop_ontologies.override { v = "0.5"; }; shared_desktop_ontologies = shared_desktop_ontologies.override { v = "0.5"; };
stdenv = stdenv2; stdenv = stdenv2;
}); });