nanonixos
Check-in [4f46b15285]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
SHA1 Hash:4f46b1528506025b78c167c36df60cb2b10ce152
Date: 2011-04-23 15:13:31
User: viric
Comment:Trying to build mplayer with the dvdk patches on gpu acceleration.
Tags And Properties
Changes
hide diffs unified diffs patch

Changes to default.nix

1 let 1 let 2 path = builtins.getEnv "NANONIXOS_NIXPKGS"; 2 path = builtins.getEnv "NANONIXOS_NIXPKGS"; 3 pkgsFun = if path != "" then (import path) else (import 3 pkgsFun = if path != "" then (import path) else (import 4 /home/viric/arm/stdenv-updates-svn); | 4 /etc/nixos/nixpkgs); 5 5 6 config = { 6 config = { 7 packageOverrides = pkgs: rec { 7 packageOverrides = pkgs: rec { 8 SDL = pkgs.SDL.override { 8 SDL = pkgs.SDL.override { 9 x11Support = false; 9 x11Support = false; 10 openglSupport = false; 10 openglSupport = false; 11 }; 11 }; > 12 > 13 jz47xx_vid = pkgs.stdenv.mkDerivation { > 14 name = "jz47xx_vid-0.1.1"; > 15 src = pkgs.fetchurl { > 16 url = mirror://sourceforge/mplayer-jz47xx/mplayer_jz47xx-0.1.1.tar.gz; > 17 sha256 = "146mvzppahp1dyq927jqa6z5r7pfcxz745k4l0jkvj21z5xjz22y"; > 18 }; > 19 }; > 20 12 MPlayer = pkgs.MPlayer.override { | 21 MPlayer = pkgs.MPlayer // { hostDrv = pkgs.lib.overrideDerivation (pkgs.MPlayer.override { 13 x264Support = false; 22 x264Support = false; 14 dvdnavSupport = false; 23 dvdnavSupport = false; 15 x11Support = false; 24 x11Support = false; 16 jackaudioSupport = false; 25 jackaudioSupport = false; 17 cddaSupport = false; 26 cddaSupport = false; 18 xineramaSupport = false; 27 xineramaSupport = false; 19 randrSupport = false; 28 randrSupport = false; 20 xvSupport = false; 29 xvSupport = false; > 30 }).hostDrv (oldAttrs: let > 31 jz4xxpatch = pkgs.fetchurl { > 32 url = "http://projects.qi-hardware.com/index.php/p/openwrt-packages/source/file/master/mplayer/patches/010-jz47xx-vidix.patch"; > 33 sha256 = "0sy76wk2n5i918dg11ndxmmwsp35hnvamp8a1mb26w54ssppmmdi"; > 34 }; > 35 in > 36 { > 37 patches = [ jz4xxpatch ]; > 38 }); 21 }; 39 }; 22 40 23 libao = pkgs.libao.override { 41 libao = pkgs.libao.override { 24 usePulseAudio = false; 42 usePulseAudio = false; 25 }; 43 }; 26 busybox = pkgs.busybox.override { 44 busybox = pkgs.busybox.override { 27 extraConfig = '' 45 extraConfig = '' ........................................................................................................................................................................................................................................................................................................................ 70 gnumake.hostDrv 88 gnumake.hostDrv 71 ]; 89 ]; 72 90 73 extraPackagesSim = with nixpkgsNano; [ 91 extraPackagesSim = with nixpkgsNano; [ 74 fossil.hostDrv 92 fossil.hostDrv 75 strace.hostDrv 93 strace.hostDrv 76 ts.hostDrv 94 ts.hostDrv > 95 (stdenv.mkDerivation { > 96 name = "offcurr-973bbaffcf"; > 97 src = fetchurl { > 98 url = "http://vicerveza.homeunix.net/~viric/cgi-bin/offrss/zip/offrss-973bbaffcf807f00.zip?uuid=973bbaffcf807f004947f7b32e1e22ae07c3876a"; > 99 name = "offcurr-973bbaffcf.zip"; > 100 md5 = "d41d8cd98f00b204e9800998ecf8427e"; > 101 }; > 102 buildInputs = [ libmrss curl ]; > 103 }).hostDrv 77 ]; 104 ]; 78 105 79 packagesSim = import ./packages.nix { 106 packagesSim = import ./packages.nix { 80 pkgs = nixpkgsSim; 107 pkgs = nixpkgsSim; 81 extraPackages = extraPackagesSim; 108 extraPackages = extraPackagesSim; 82 nandSettings = { 109 nandSettings = { 83 volumeSize = "150000000"; 110 volumeSize = "150000000";

Changes to profile.nix

6 ignoreCollisions = true; 6 ignoreCollisions = true; 7 paths = [ 7 paths = [ 8 busybox.hostDrv 8 busybox.hostDrv 9 dropbear.hostDrv 9 dropbear.hostDrv 10 sysvinit.hostDrv 10 sysvinit.hostDrv 11 bashInteractive.hostDrv 11 bashInteractive.hostDrv 12 mingetty.hostDrv 12 mingetty.hostDrv 13 nixUnstable.hostDrv | 13 # nixUnstable.hostDrv BROKEN boehmgc 14 kbd.hostDrv 14 kbd.hostDrv 15 ] ++ extraPackages; 15 ] ++ extraPackages; 16 pathsToLink = [ "/bin" "/usr" "/sbin" "/lib" "/share/man"]; 16 pathsToLink = [ "/bin" "/usr" "/sbin" "/lib" "/share/man"]; 17 } 17 }