mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
parent
73d798549f
commit
42574f52b9
@ -544,7 +544,7 @@ stdenv.mkDerivation ({
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Strip kills static libs of other archs (hence cross != null)
|
# Strip kills static libs of other archs (hence cross != null)
|
||||||
// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
|
// optionalAttrs (!stripped || cross != null) { dontStrip = true; }
|
||||||
|
|
||||||
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
|
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
|
||||||
)
|
)
|
||||||
|
@ -551,7 +551,7 @@ stdenv.mkDerivation ({
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Strip kills static libs of other archs (hence cross != null)
|
# Strip kills static libs of other archs (hence cross != null)
|
||||||
// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
|
// optionalAttrs (!stripped || cross != null) { dontStrip = true; }
|
||||||
|
|
||||||
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
|
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
|
||||||
|
|
||||||
|
@ -547,7 +547,7 @@ stdenv.mkDerivation ({
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Strip kills static libs of other archs (hence cross != null)
|
# Strip kills static libs of other archs (hence cross != null)
|
||||||
// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
|
// optionalAttrs (!stripped || cross != null) { dontStrip = true; }
|
||||||
|
|
||||||
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
|
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
|
||||||
)
|
)
|
||||||
|
@ -545,7 +545,7 @@ stdenv.mkDerivation ({
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Strip kills static libs of other archs (hence cross != null)
|
# Strip kills static libs of other archs (hence cross != null)
|
||||||
// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
|
// optionalAttrs (!stripped || cross != null) { dontStrip = true; }
|
||||||
|
|
||||||
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
|
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
|
||||||
)
|
)
|
||||||
|
@ -10,7 +10,6 @@ PATH="$PATH:$OLDPATH"
|
|||||||
export PS1="\n@name@:[\u@\h:\w]\$ "
|
export PS1="\n@name@:[\u@\h:\w]\$ "
|
||||||
export NIX_MYENV_NAME="@name@"
|
export NIX_MYENV_NAME="@name@"
|
||||||
export buildInputs
|
export buildInputs
|
||||||
export NIX_STRIP_DEBUG=0
|
|
||||||
export TZ="$OLDTZ"
|
export TZ="$OLDTZ"
|
||||||
export http_proxy="$OLD_http_proxy"
|
export http_proxy="$OLD_http_proxy"
|
||||||
export ftp_proxy="$OLD_ftp_proxy"
|
export ftp_proxy="$OLD_ftp_proxy"
|
||||||
|
Loading…
Reference in New Issue
Block a user