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

treewide: Remove usage of remaining redundant platform compatability stuff

Browse Source 
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
This commit is contained in:
John Ericson
2018-08-30 17:20:32 -04:00
parent 2c2f1e37d4
commit 0828e2d8c3
149 changed files with 545 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/readline/6.2.nix
+1 -2
View File
@@ -1,5 +1,4 @@
{ fetchurl, stdenv, ncurses
, buildPlatform, hostPlatform
}:
stdenv.mkDerivation (rec {
@@ -59,6 +58,6 @@ stdenv.mkDerivation (rec {
//
# Don't run the native `strip' when cross-compiling.
(if hostPlatform != buildPlatform
(if stdenv.hostPlatform != stdenv.buildPlatform
then { dontStrip = true; }
else { }))
pkgs/development/libraries/readline/6.3.nix
+2 -4
View File
@@ -1,6 +1,4 @@
{ fetchurl, stdenv, ncurses
, buildPlatform, hostPlatform
}:
{ fetchurl, stdenv, ncurses }:
stdenv.mkDerivation rec {
name = "readline-6.3p08";
@@ -37,7 +35,7 @@ stdenv.mkDerivation rec {
import ./readline-6.3-patches.nix patch);
# Don't run the native `strip' when cross-compiling.
dontStrip = hostPlatform != buildPlatform;
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null;
meta = with stdenv.lib; {
pkgs/development/libraries/readline/7.0.nix
+1 -2
View File
@@ -1,5 +1,4 @@
{ fetchurl, stdenv, ncurses
, buildPlatform, hostPlatform
}:
stdenv.mkDerivation rec {
@@ -34,7 +33,7 @@ stdenv.mkDerivation rec {
++ upstreamPatches;
# Don't run the native `strip' when cross-compiling.
dontStrip = hostPlatform != buildPlatform;
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null;
meta = with stdenv.lib; {