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

* Fix breakage in r22897.

Browse Source 
svn path=/nixpkgs/trunk/; revision=22901
This commit is contained in:
Eelco Dolstra
2010-08-02 17:59:19 +00:00
parent a162c597e1
commit 7e453a7491
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+3 -12
View File
@@ -5980,23 +5980,14 @@ let
inherit (kde4) qt4 kdelibs automoc4 phonon; inherit (kde4) qt4 kdelibs automoc4 phonon;
}; };
<<<<<<< HEAD rsibreak = callPackage ../applications/misc/rsibreak {
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; inherit (kde4) kdelibs kdebase_workspace;
}; };
rsync = import ../applications/networking/sync/rsync { rsync = callPackage ../applications/networking/sync/rsync {
inherit fetchurl stdenv acl perl;
>>>>>>> Add rsibreak
enableACLs = !stdenv.isDarwin; enableACLs = !stdenv.isDarwin;
}; };
rxvt = callPackage ../applications/misc/rxvt { }; rxvt = callPackage ../applications/misc/rxvt { };
# = urxvt # = urxvt