Author: raskin
Date: Mon Dec  5 04:39:53 2011
New Revision: 30734
URL: https://nixos.org/websvn/nix/?rev=30734&sc=1

Log:
Package set update; a function to move data packages across archs

Modified:
   configurations/trunk/misc/raskin/lesser-expressions/pb.nix

Modified: configurations/trunk/misc/raskin/lesser-expressions/pb.nix
==============================================================================
--- configurations/trunk/misc/raskin/lesser-expressions/pb.nix  Mon Dec  5 
04:39:25 2011        (r30733)
+++ configurations/trunk/misc/raskin/lesser-expressions/pb.nix  Mon Dec  5 
04:39:53 2011        (r30734)
@@ -50,6 +50,13 @@
     };
   };
   justUse = str : (builtins.getAttr str pkgs).hostDrv;
+  crossWashData = pkg: ((pkgs.stdenv.mkDerivation {
+    name = "${pkg.name}-washed-for";
+    unpackPhase = " ";
+    installPhase = ''
+      cp -r "${pkg}" "$out"
+    '';
+  }).hostDrv);
 in 
 (pkgs.symlinkJoin "raskin-pb-packages" 
  (
@@ -63,11 +70,12 @@
    "gnugrep" "gnused"
    "coreutils" "fakeroot"
    "tmux" "glibcLocales"
-   "lsh" "openssh"
+   "lsh" "openssh" "xkeyboard_config"
    ]) 
   ++
   [
     (pkgs.gcc45.hostDrv)
+    (pkgs.xorg.xkbcomp.hostDrv)
     (pkgs.lib.overrideDerivation
       pkgs.tigervnc.hostDrv
       (p : {
@@ -86,4 +94,8 @@
       })
       )
   ]
+  ++ (map
+        crossWashData
+       pkgs.tigervnc.fontDirectories
+        )
  )).hostDrv
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to