Unverified Commit 36b1cf2f authored by Stefan Frijters's avatar Stefan Frijters
Browse files

wine: prepare for structuredAttrs

parent 39975b74

pkgs/applications/emulators/wine/base.nix

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ stdenv.mkDerivation ( 
    # Wine locates a lot of libraries dynamically through dlopen().  Add

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

    # LD_LIBRARY_PATH.

    NIX_LDFLAGS = toString (

    env.NIX_LDFLAGS = toString (

      map (path: "-rpath " + path) (

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

        # libpulsecommon.so is linked but not found otherwise

pkgs/applications/emulators/wine/builder-wow.sh

+3 −3
Original line number Diff line number Diff line 
## build described at https://wiki.winehq.org/Building_Wine#Shared_WoW64

preFlags="${configureFlags}"

preFlags="${configureFlags[@]}"



unpackPhase

cd $TMP/$sourceRoot
@@ -10,7 +10,7 @@ mkdir -p $TMP/wine-wow $TMP/wine64 


cd $TMP/wine64

sourceRoot=`pwd`

configureFlags="${preFlags} --enable-win64"

configureFlags=($preFlags --enable-win64)

configurePhase

buildPhase

# checkPhase
@@ -37,7 +37,7 @@ PKG_CONFIG_PATH=$(IFS=":"; echo "${NEW_LIST_ARRAY[*]}") 


cd $TMP/wine-wow

sourceRoot=`pwd`

configureFlags="${preFlags} --with-wine64=../wine64"

configureFlags=($preFlags --with-wine64=../wine64)

configurePhase

buildPhase

# checkPhase