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

Trouble in my last tigervnc commit. Fixing it.

Browse Source 
svn path=/nixpkgs/trunk/; revision=22570
This commit is contained in:
Lluís Batlle i Rossell 2010-07-12 22:32:22 +00:00
parent 6c0b62d1a5
commit 6a1cee4a69
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/admin/tigervnc/default.nix
View File

@ -21,6 +21,8 @@ stdenv.mkDerivation {
sed -i -e 's,$(includedir)/pixman-1,${pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am sed -i -e 's,$(includedir)/pixman-1,${pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am
''; '';
# I don't know why I can't use in the script
# this: ${concatStringsSep " " (map (f: "${f}") xorgserver.patches)}
xorgPatches = xorgserver.patches; xorgPatches = xorgserver.patches;
postBuild = '' postBuild = ''
@ -28,8 +30,6 @@ stdenv.mkDerivation {
tar xf ${xorgserver.src} tar xf ${xorgserver.src}
cp -R xorg*/* unix/xserver cp -R xorg*/* unix/xserver
pushd unix/xserver pushd unix/xserver
# This below does not work and I don't know why:
#for a in ${concatStringsSep " " (map (f: "${f}") xorgserver.patches)}
for a in $xorgPatches for a in $xorgPatches
do do
patch -p1 < $a patch -p1 < $a