mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-23 12:00:35 -04:00
Add rsibreak
svn path=/nixpkgs/trunk/; revision=22897
This commit is contained in:
parent
230c31d020
commit
dea41a12ea
12
pkgs/applications/misc/rsibreak/default.nix
Normal file
12
pkgs/applications/misc/rsibreak/default.nix
Normal 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 ];
|
||||
}
|
|
@ -5980,7 +5980,20 @@ let
|
|||
inherit (kde4) qt4 kdelibs automoc4 phonon;
|
||||
};
|
||||
|
||||
<<<<<<< HEAD
|
||||
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;
|
||||
};
|
||||
|
||||
|
@ -6580,6 +6593,9 @@ let
|
|||
});
|
||||
|
||||
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"; };
|
||||
stdenv = stdenv2;
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue