From 839d828b9c367e384c41077d4c76494515c156aa Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 12 Aug 2022 15:51:22 +0000 Subject: [PATCH] treewide: firmware: stdenv -> stdenvNoCC None of these packages use a compiler, except for alsa-firmware, which has the appropriate compiler in depsBuildBuild already. Tested by building a NixOS system with hardware.enableAllFirmware = true. --- pkgs/data/misc/wireless-regdb/default.nix | 4 ++-- .../linux/alsa-project/alsa-firmware/default.nix | 4 ++-- pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix | 5 ++--- .../linux/firmware/b43-firmware/6.30.163.46.nix | 4 ++-- .../linux/firmware/broadcom-bt-firmware/default.nix | 7 ++----- .../linux/firmware/facetimehd-calibration/default.nix | 4 ++-- .../linux/firmware/facetimehd-firmware/default.nix | 4 ++-- .../linux/firmware/intel2200BGFirmware/default.nix | 4 ++-- .../linux/firmware/libreelec-dvb-firmware/default.nix | 4 ++-- .../linux/firmware/raspberrypi-wireless/default.nix | 4 ++-- pkgs/os-specific/linux/firmware/rt5677/default.nix | 4 ++-- .../linux/firmware/rtl8192su-firmware/default.nix | 4 ++-- .../linux/firmware/rtl8723bs-firmware/default.nix | 4 ++-- .../linux/firmware/rtl8761b-firmware/default.nix | 4 ++-- .../linux/firmware/xow_dongle-firmware/default.nix | 6 ++---- pkgs/os-specific/linux/firmware/zd1211/default.nix | 4 ++-- 16 files changed, 32 insertions(+), 38 deletions(-) diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index 2c92896b5a1c..cef187bf2578 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "wireless-regdb"; version = "2022.06.06"; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix index 2ef971a8cf7f..8ddc97890e92 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPackages, stdenv, autoreconfHook, fetchurl }: +{ lib, buildPackages, stdenvNoCC, autoreconfHook, fetchurl }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "alsa-firmware"; version = "1.2.4"; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index 98d793c5d998..a5683a1ce535 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, b43FirmwareCutter }: +{ lib, stdenvNoCC, fetchurl, b43FirmwareCutter }: let version = "5.100.138"; in -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "b43-firmware"; inherit version; @@ -24,4 +24,3 @@ stdenv.mkDerivation { license = lib.licenses.unfree; }; } - diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index 92c179726d25..e117db45b182 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, b43FirmwareCutter }: +{ lib, stdenvNoCC, fetchurl, b43FirmwareCutter }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "b43-firmware"; version = "6.30.163.46"; diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix index a0985cad0dbe..073d443bee41 100644 --- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix @@ -1,9 +1,6 @@ -{ lib, stdenv, fetchurl, cabextract, bt-fw-converter }: +{ lib, stdenvNoCC, fetchurl, cabextract, bt-fw-converter }: -# Kernels between 4.2 and 4.7 will not work with -# this packages as they expect the firmware to be named "BCM.hcd" -# see: https://github.com/NixOS/nixpkgs/pull/25478#issuecomment-299034865 -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "broadcom-bt-firmware"; version = "12.0.1.1012"; diff --git a/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix index 86a3924c0e28..ca6782688728 100644 --- a/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix +++ b/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unrar-wrapper, pkgs }: +{ lib, stdenvNoCC, fetchurl, unrar-wrapper, pkgs }: let @@ -24,7 +24,7 @@ let in -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "facetimehd-calibration"; inherit version; diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix index 1c3d8fbbaf7d..6679f1f19e75 100644 --- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cpio, xz, pkgs }: +{ lib, stdenvNoCC, fetchurl, cpio, xz, pkgs }: let @@ -33,7 +33,7 @@ let in -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "facetimehd-firmware"; inherit version; diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index 7c195cd2d7ca..716c5e4d8288 100644 --- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ stdenvNoCC , lib , fetchurl }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "intel2200BGFirmware"; version = "3.1"; diff --git a/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix index 2103012d3ed9..9579ff11c739 100644 --- a/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, lib}: +{ stdenvNoCC, fetchFromGitHub, lib}: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "libreelec-dvb-firmware"; version = "1.4.2"; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index c9192744a46a..730e839bd457 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "raspberrypi-wireless-firmware"; version = "2021-12-06"; diff --git a/pkgs/os-specific/linux/firmware/rt5677/default.nix b/pkgs/os-specific/linux/firmware/rt5677/default.nix index f21d34bbe533..47e0068cc348 100644 --- a/pkgs/os-specific/linux/firmware/rt5677/default.nix +++ b/pkgs/os-specific/linux/firmware/rt5677/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "rt5677-firmware"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix index 3363140ad569..53f32ac31f9d 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: with lib; -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "rtl8192su"; version = "unstable-2016-10-05"; diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix index f3ea80348b3b..8e486e1c4b2c 100644 --- a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, linuxPackages }: +{ lib, stdenvNoCC, linuxPackages }: with lib; -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "rtl8723bs-firmware"; version = linuxPackages.rtl8723bs.version; inherit (linuxPackages.rtl8723bs) src; diff --git a/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix index 925521696da9..c3fbe79537c4 100644 --- a/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "rtl8761b-firmware"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix b/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix index 72e3817f2aa2..824615a4baf2 100644 --- a/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchurl, cabextract }: +{ stdenvNoCC, lib, fetchurl, cabextract }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "xow_dongle-firmware"; version = "2017-07"; @@ -32,5 +32,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - - diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index 075e46a5de55..6b86277ebc6e 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ stdenvNoCC , lib , fetchurl }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "zd1211-firmware"; version = "1.5";