diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-08-02 17:59:19 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-08-02 17:59:19 +0000 |
| commit | 7e453a7491c84057292c590f579915cc3bf335bd (patch) | |
| tree | 9b8b7533e675115e0b49b7906e8681ac1c577d54 | |
| parent | a162c597e156760559a7e5a7eba0e173592c8ea5 (diff) | |
| download | nixpkgs-7e453a7491c84057292c590f579915cc3bf335bd.tar nixpkgs-7e453a7491c84057292c590f579915cc3bf335bd.tar.gz nixpkgs-7e453a7491c84057292c590f579915cc3bf335bd.tar.bz2 nixpkgs-7e453a7491c84057292c590f579915cc3bf335bd.tar.lz nixpkgs-7e453a7491c84057292c590f579915cc3bf335bd.tar.xz nixpkgs-7e453a7491c84057292c590f579915cc3bf335bd.tar.zst nixpkgs-7e453a7491c84057292c590f579915cc3bf335bd.zip | |
* Fix breakage in r22897.
svn path=/nixpkgs/trunk/; revision=22901
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3791c5fb460..532c83c20cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5980,23 +5980,14 @@ 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; + rsibreak = callPackage ../applications/misc/rsibreak { inherit (kde4) kdelibs kdebase_workspace; }; - rsync = import ../applications/networking/sync/rsync { - inherit fetchurl stdenv acl perl; ->>>>>>> Add rsibreak + rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !stdenv.isDarwin; }; - + rxvt = callPackage ../applications/misc/rxvt { }; # = urxvt |