···

       
20
       
20
       
 
       
    services.xserver.windowManager.session = singleton

     

       
21
       
21
       
 
       
      { name = "metacity";

     

       
22
       
22
       
 
       
        start = ''

     

       
23
       
23
       
-
       
          env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext.out}/lib:/usr/lib/

     

       
23
       
23
       
+
       
          env LD_LIBRARY_PATH=${lib.makeLibraryPath [ xorg.libX11 xorg.libXext ]}:/usr/lib/

     

       
24
       
24
       
 
       
          # !!! Hack: load the schemas for Metacity.

     

       
25
       
25
       
 
       
          GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \

     

       
26
       
26
       
 
       
            --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */

     

···

       
26
       
26
       
 
       
    sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt

     

       
27
       
27
       
 
       
  '';

     

       
28
       
28
       
 
       


     

       
29
       
29
       
-
       
  configurePhase = ''    

     

       
29
       
29
       
+
       
  configurePhase = ''

     

       
30
       
30
       
 
       
    findInputs ${boost} boost_dirs propagated-native-build-inputs

     

       
31
       
31
       
 
       


     

       
32
       
32
       
 
       
    export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include

     
···

       
35
       
35
       
 
       
    mkdir -p Build

     

       
36
       
36
       
 
       
    pushd Build

     

       
37
       
37
       
 
       


     

       
38
       
38
       
-
       
    export LD_LIBRARY_PATH="${blas}/lib:${nvidia_x11}/lib"

     

       
38
       
38
       
+
       
    export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [ blas nvidia_x11 ]}"

     

       
39
       
39
       
 
       


     

       
40
       
40
       
 
       
    cmake ../src -DCMAKE_INSTALL_PREFIX=$out \

     

       
41
       
41
       
 
       
                 -DCMAKE_BUILD_TYPE=Release \

     

···

       
44
       
44
       
 
       
    sed -i \

     

       
45
       
45
       
 
       
      -e 's|$(uname -m)|i686|' \

     

       
46
       
46
       
 
       
      -e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \

     

       
47
       
47
       
-
       
      -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${libXtst}/lib:${glib}/lib:${gtk2}/lib:./x10flasher_lib/linux/lib32|' \

     

       
47
       
47
       
+
       
      -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \

     

       
48
       
48
       
 
       
      FlashTool FlashToolConsole

     

       
49
       
49
       
 
       
  '';

     

       
50
       
50