Author: raskin
Date: Thu Dec 1 18:55:27 2011
New Revision: 30654
URL: https://nixos.org/websvn/nix/?rev=30654&sc=1
Log:
package set updates
Modified:
configurations/trunk/misc/raskin/lesser-expressions/pb.nix
configurations/trunk/misc/raskin/private-packages.nix
Modified: configurations/trunk/misc/raskin/lesser-expressions/pb.nix
==============================================================================
--- configurations/trunk/misc/raskin/lesser-expressions/pb.nix Thu Dec 1
16:41:43 2011 (r30653)
+++ configurations/trunk/misc/raskin/lesser-expressions/pb.nix Thu Dec 1
18:55:27 2011 (r30654)
@@ -61,11 +61,21 @@
"binutils" "gdb"
"utillinuxng" "less"
"gnugrep" "gnused"
- "coreutils"
+ "coreutils" "fakeroot"
"tmux" "glibcLocales"
+ "lsh" "openssh"
])
++
[
- (pkgs.gcc45.hostDrv)
+ (pkgs.gcc44.hostDrv)
+ (pkgs.lib.overrideDerivation
+ pkgs.tigervnc
+ (p : {
+ buildPhase = ''
+ make -C common
+ '' + p.postBuild;
+ installPhase = p.postInstall;
+ })
+ )
]
)).hostDrv
Modified: configurations/trunk/misc/raskin/private-packages.nix
==============================================================================
--- configurations/trunk/misc/raskin/private-packages.nix Thu Dec 1
16:41:43 2011 (r30653)
+++ configurations/trunk/misc/raskin/private-packages.nix Thu Dec 1
18:55:27 2011 (r30654)
@@ -52,4 +52,13 @@
buildInputs = x.buildInputs ++ [expat gnome.libglade];
configureFlags = x.configureFlags + " --with-libexpat-prefix=${expat}/ ";
});
+ webdsl = lib.overrideDerivation pkgsi686Linux.webdsl (x : {
+ src = "/home/repos/webdsl/";
+ buildInputs = x.buildInputs ++ [glib libtool autoconf automake m4 ant ];
+ preConfigure = ''
+ echo "${builtins.readFile "/home/repos/webdsl/.svn/wc.db"}" &> /dev/null
+ libtoolize
+ ./bootstrap
+ '';
+ });
}
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
