diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-20 15:11:29 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-30 17:20:32 -0400 |
commit | 2c2f1e37d4374ea61caefd9389927ea03df4ce31 (patch) | |
tree | 1c0dff3f6483825a9143741bdddca44f35bb4224 /pkgs/applications/misc/playonlinux/default.nix | |
parent | 94f71d800db2ef7afb9fc8dad9e9aa503bfa2941 (diff) | |
download | nixpkgs-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar nixpkgs-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.gz nixpkgs-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.bz2 nixpkgs-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.lz nixpkgs-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.xz nixpkgs-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.zst nixpkgs-2c2f1e37d4374ea61caefd9389927ea03df4ce31.zip |
reewide: Purge all uses `stdenv.system` and top-level `system`
It is deprecated and will be removed after 18.09.
Diffstat (limited to 'pkgs/applications/misc/playonlinux/default.nix')
-rw-r--r-- | pkgs/applications/misc/playonlinux/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 2ad6321d519..8c9f13ce92c 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -44,9 +44,9 @@ let ]; ld32 = - if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" - else if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" - else throw "Unsupported platform for PlayOnLinux: ${stdenv.system}"; + if stdenv.hostPlatform.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" + else if stdenv.hostPlatform.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" + else throw "Unsupported platform for PlayOnLinux: ${stdenv.hostPlatform.system}"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xorg.libX11 ]; @@ -83,7 +83,7 @@ in stdenv.mkDerivation { bunzip2 $out/share/playonlinux/bin/check_dd_x86.bz2 patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${libs pkgsi686Linux} $out/share/playonlinux/bin/check_dd_x86 - ${if stdenv.system == "x86_64-linux" then '' + ${if stdenv.hostPlatform.system == "x86_64-linux" then '' bunzip2 $out/share/playonlinux/bin/check_dd_amd64.bz2 patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${libs pkgs} $out/share/playonlinux/bin/check_dd_amd64 '' else '' |