commit d3705faa560c9831bcc27ffebb1eaaca291c64f0 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/x11/window-managers/metacity.nix

···

       20
        
           services.xserver.windowManager.session = singleton

     

       21
        
             { name = "metacity";

     

       22
        
               start = ''

     

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

     

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

     

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

     

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

···

       20
        
           services.xserver.windowManager.session = singleton

     

       21
        
             { name = "metacity";

     

       22
        
               start = ''

     

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

     

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

     

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

     

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

+2 -2

pkgs/development/libraries/science/math/clblas/cuda/default.nix

···

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

     

       27
        
         '';

     

       28
        
       

     

       29
       -
         configurePhase = ''    

     

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

     

       31
        
       

     

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

     
···

       35
        
           mkdir -p Build

     

       36
        
           pushd Build

     

       37
        
       

     

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

     

       39
        
       

     

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

     

       41
        
                        -DCMAKE_BUILD_TYPE=Release \

···

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

     

       27
        
         '';

     

       28
        
       

     

       29
       +
         configurePhase = ''

     

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

     

       31
        
       

     

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

     
···

       35
        
           mkdir -p Build

     

       36
        
           pushd Build

     

       37
        
       

     

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

     

       39
        
       

     

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

     

       41
        
                        -DCMAKE_BUILD_TYPE=Release \

+1 -1

pkgs/development/mobile/flashtool/default.nix

···

       44
        
           sed -i \

     

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

     

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

     

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

     

       48
        
             FlashTool FlashToolConsole

     

       49
        
         '';

     

       50

···

       44
        
           sed -i \

     

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

     

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

     

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

     

       48
        
             FlashTool FlashToolConsole

     

       49
        
         '';

     

       50