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

treewide: replace stdenv.is with stdenv.hostPlatform.is

Browse Source 
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
This commit is contained in:
Artturin
2024-09-25 00:04:37 +03:00
parent aaa7fb5840
commit e0464e4788
4283 changed files with 8137 additions and 8137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/gnuplot/default.nix
+3 -3
View File
@@ -17,7 +17,7 @@
assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
let
withX = libX11 != null && !aquaterm && !stdenv.isDarwin;
withX = libX11 != null && !aquaterm && !stdenv.hostPlatform.isDarwin;
in
(if withQt then mkDerivation else stdenv.mkDerivation) rec {
pname = "gnuplot";
@@ -38,7 +38,7 @@ in
++ lib.optionals withX [ libX11 libXpm libXt libXaw ]
++ lib.optionals withQt [ qtbase qtsvg ]
++ lib.optional withWxGTK wxGTK32
++ lib.optional (withWxGTK && stdenv.isDarwin) Cocoa;
++ lib.optional (withWxGTK && stdenv.hostPlatform.isDarwin) Cocoa;
postPatch = ''
# lrelease is in qttools, not in qtbase.
@@ -51,7 +51,7 @@ in
(if aquaterm then "--with-aquaterm" else "--without-aquaterm")
] ++ lib.optional withCaca "--with-caca";
CXXFLAGS = lib.optionalString (stdenv.isDarwin && withQt) "-std=c++11";
CXXFLAGS = lib.optionalString (stdenv.hostPlatform.isDarwin && withQt) "-std=c++11";
# we'll wrap things ourselves
dontWrapGApps = true;