diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-11-13 06:47:08 -0800 |
|---|---|---|
| committer | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-11-17 08:07:34 +0000 |
| commit | c7e0f6b9050553dfa8dff259a0536326ac43b0ff (patch) | |
| tree | 6862049af64b6ccf9911f5cb54f1651aaf07a182 /pkgs/misc | |
| parent | 6a689e72efffde73cc2c6cfa7e142a8d7f8feafd (diff) | |
| download | nixpkgs-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar nixpkgs-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar.gz nixpkgs-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar.bz2 nixpkgs-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar.lz nixpkgs-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar.xz nixpkgs-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar.zst nixpkgs-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.zip | |
treewide: s_targetPlatform_hostPlatform_ in non-compiler packages
stdenv.targetPlatform really shouldn't be used by software that doesn't generate or manipulate binaries. I reviewed all uses of targetPlatform outside of pkgs/development/compilers and pkgs/stdenv and replaced those which weren't involved in something which fits these criteria.
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/cups/drivers/canon/default.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index ba414d7aec5..c8df29776db 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # service would stop the socket and break subsequent socket activations. # See https://github.com/apple/cups/issues/6005 sed -i '/PartOf=cups.service/d' scheduler/cups.socket.in - '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12") '' substituteInPlace backend/usb-darwin.c \ --replace "kIOMainPortDefault" "kIOMasterPortDefault" ''; diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index 40438d333cf..8614bdda2ab 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -26,9 +26,9 @@ let system = - if stdenv.targetPlatform.system == "x86_64-linux" then "intel" - else if stdenv.targetPlatform.system == "aarch64-linux" then "arm" - else throw "Unsupported platform for Canon UFR2 Drivers: ${stdenv.targetPlatform.system}"; + if stdenv.hostPlatform.system == "x86_64-linux" then "intel" + else if stdenv.hostPlatform.system == "aarch64-linux" then "arm" + else throw "Unsupported platform for Canon UFR2 Drivers: ${stdenv.hostPlatform.system}"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; libs = pkgs: lib.makeLibraryPath buildInputs; |