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/science/logic | |
| 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/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/isabelle/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/saw-tools/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index ae04c11d959..ffe50856955 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { rm -rf $comp/x86* done '' + (if ! stdenv.isLinux then "" else '' - arch=${if stdenv.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} + arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} for f in contrib/*/$arch/{bash_process,epclextract,eprover,nunchaku,SPASS}; do patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" done diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index 65d2b4d91c3..32ebdad51d9 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -12,7 +12,7 @@ let url = "https://github.com/GaloisInc/saw-script/releases/download"; saw-bin = - if stdenv.system == "i686-linux" + if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-32.tar.gz"; sha256 = "126iag5nnvndi78c921z7vjrjfwcspn1hlxwwhzmqm4rvbhhr9v9"; |