diff options
| -rw-r--r-- | pkgs/applications/misc/rsibreak/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 16 |
2 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix new file mode 100644 index 000000000000..939797d9dc5a --- /dev/null +++ b/pkgs/applications/misc/rsibreak/default.nix @@ -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 ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef91cc97fd6a..3791c5fb4602 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }); |