Merge pull request #302557 from anthonyroussel/anthonyroussel-stdenvnocc

tomb,win-pvdrivers,tomcat,axis2,jetty: use stdenvNoCC
This commit is contained in:
Jörg Thalheim 2024-04-10 09:06:26 +02:00 committed by GitHub
commit e7ed94636e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 11 additions and 11 deletions

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenvNoCC, fetchurl }:
let
# Upstream versioned download links are broken
@ -40,7 +40,7 @@ let
];
in
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
pname = "win-pvdrivers";
version = "unstable-2023-08-17";

View File

@ -1,4 +1,4 @@
{ stdenv
{ stdenvNoCC
, lib
, fetchFromGitHub
, substituteAll
@ -20,7 +20,7 @@
, nix-update-script
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "tomb";
version = "2.10";
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
postPatch = ''
# if not, it shows .tomb-wrapped when running
substituteInPlace tomb \
--replace 'TOMBEXEC=$0' 'TOMBEXEC=tomb'
--replace-fail 'TOMBEXEC=$0' 'TOMBEXEC=tomb'
'';
installPhase = ''

View File

@ -1,8 +1,8 @@
{ version, hash }:
{ lib, stdenv, fetchurl }:
{ lib, stdenvNoCC, fetchurl }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "jetty";
inherit version;

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, apacheAnt, jdk, unzip }:
{ lib, stdenvNoCC, fetchurl, apacheAnt, jdk, unzip }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "axis2";
version = "1.8.2";

View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, nixosTests, testers, jre }:
{ stdenvNoCC, lib, fetchurl, nixosTests, testers, jre }:
let
common = { version, hash }: stdenv.mkDerivation (finalAttrs: {
common = { version, hash }: stdenvNoCC.mkDerivation (finalAttrs: {
pname = "apache-tomcat";
inherit version;