public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renoise: Don't use builtins.currentSystem

Browse Source 
stdenv.system should be almost always used instead of builtins.currentSystem
or cross-evaluation (e.g. evaluating a i686 NixOS system on a 64-bit nix)
will be subtly broken.
This commit is contained in:
Tuomas Tynkkynen 2016-02-27 19:56:18 +02:00
parent b612e1e656
commit 58f0071a9e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/renoise/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ]; buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
src = src =
if builtins.currentSystem == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
if demo then if demo then
fetchurl { fetchurl {
url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86_64.tar.bz2"; url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86_64.tar.bz2";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
name = "rns_3_0_1_linux_x86_64.tar.gz"; name = "rns_3_0_1_linux_x86_64.tar.gz";
sha256 = "1yb5w5jrg9dk9fg5rfvfk6p0rxn4r4i32vxp2l9lzhbs02pv15wd"; sha256 = "1yb5w5jrg9dk9fg5rfvfk6p0rxn4r4i32vxp2l9lzhbs02pv15wd";
} }
else if builtins.currentSystem == "i686-linux" then else if stdenv.system == "i686-linux" then
if demo then if demo then
fetchurl { fetchurl {
url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86.tar.bz2"; url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86.tar.bz2";