[Nix-dev] Re: [Nix-commits] SVN commit: nix - r26239 - nixpkgs/trunk/pkgs/tools/misc/grub

[Shea Levy]

On 3/9/11 2:02 PM, Shea Levy wrote:
> On 3/9/11 1:58 PM, Karn Kallio wrote:
>> Author: kkallio
>> Date: Wed Mar  9 18:58:09 2011
>> New Revision: 26239
>> URL: https://svn.nixos.org/websvn/nix/?rev=26239&sc=1
>>
>> Log:
>> Fix grub error "cp cannot stat .... unicode.pf2
>> -- change postPatch hook to prePatch (postPatch is not run with empty 
>> patchset)
>> -- make the share/grub directory and copy unicode.pf2 there
>>
>> Modified:
>>     nixpkgs/trunk/pkgs/tools/misc/grub/1.9x.nix
>>
>> Modified: nixpkgs/trunk/pkgs/tools/misc/grub/1.9x.nix
>> ============================================================================== 
>>
>> --- nixpkgs/trunk/pkgs/tools/misc/grub/1.9x.nix    Wed Mar  9 
>> 17:13:29 2011    (r26238)
>> +++ nixpkgs/trunk/pkgs/tools/misc/grub/1.9x.nix    Wed Mar  9 
>> 18:58:09 2011    (r26239)
>> @@ -41,12 +41,17 @@
>>              -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
>>       '';
>>
>> -  postPatch =
>> +  prePatch =
>>       '' gunzip<  "${unifont_bdf}">  "unifont.bdf"
>>          sed -i "configure" \
>>              -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
>>       '';
>>
>> +  postInstall = ''
>> +    ensureDir ./share/grub
>> +    cp ./unicode.pf2 ./share/grub/
>> +  '';
>> +
>>     configureFlags =
>>       let arch = if stdenv.system == "i686-linux" then "i386"
>>                  else if stdenv.system == "x86_64-linux" then "x86_64"
>> _______________________________________________
>> nix-commits mailing list
>> nix-commits at cs.uu.nl
>> http://mail.cs.uu.nl/mailman/listinfo/nix-commits
>
> FYI, the postInstall is not necessary. Just changing postPatch to 
> prePatch puts unicode.pf2 in the right place.
> _______________________________________________
> nix-dev mailing list
> nix-dev at cs.uu.nl
> https://mail.cs.uu.nl/mailman/listinfo/nix-dev

In fact, I'm not sure how the postInstall is useful at all, considering 
that there is no $out/unicode.pf2 and this cp is run after make install.