commit b109f33d647a10f046231333cf03970790db19e5 · pyrox.dev/nixpkgs

+9 -6
pkgs/misc/emulators/wine/base.nix
···

       14
       14
        
       }) // rec {

     

       15
       15
        
         inherit name src configureFlags;

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = toBuildInputs pkgArches (pkgs: with pkgs; [

     

       18
       18
       -
           pkgconfig alsaLib lcms2 fontforge libxml2 libxslt makeWrapper flex bison

     

       17
       17
       +
         nativeBuildInputs = toBuildInputs pkgArches (pkgs: with pkgs; [

     

       18
       18
       +
           pkgconfig fontforge makeWrapper flex bison

     

       19
       19
        
         ]);

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [

     

       21
       21
       +
         buildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [

     

       22
       22
        
           freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses

     

       23
       23
       +
           alsaLib libxml2 libxslt lcms2

     

       23
       24
        
         ])

     

       24
       25
        
         ++ lib.optional pulseaudioSupport pkgs.libpulseaudio

     

       25
       26
        
         ++ (with pkgs.xorg; [

     
···

       29
       30
        
         # Wine locates a lot of libraries dynamically through dlopen().  Add

     

       30
       31
        
         # them to the RPATH so that the user doesn't have to set them in

     

       31
       32
        
         # LD_LIBRARY_PATH.

     

       32
       32
       -
         NIX_LDFLAGS = map

     

       33
       33
       -
           (path: "-rpath ${path}/lib")

     

       34
       34
       -
           ([ stdenv.cc.cc ] ++ nativeBuildInputs);

     

       33
       33
       +
         NIX_LDFLAGS = map (path: "-rpath " + path) (

     

       34
       34
       +
             map (x: "${x}/lib") ([ stdenv.cc.cc ] ++ buildInputs)

     

       35
       35
       +
             # libpulsecommon.so is linked but not found otherwise

     

       36
       36
       +
             ++ lib.optionals pulseaudioSupport (map (x: "${x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])))

     

       37
       37
       +
           );

     

       35
       38
        
       

     

       36
       39
        
         # Don't shrink the ELF RPATHs in order to keep the extra RPATH

     

       37
       40
        
         # elements specified above.