summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRandy Eckenrode <randy@largeandhighquality.com>2023-11-10 00:36:17 -0500
committerRandy Eckenrode <randy@largeandhighquality.com>2023-11-10 13:11:04 -0500
commitf29fed8f5c765fbf3fc62d958a336496d72ea484 (patch)
treed6d8918f97806a8664bba837dfeb9d60034c9d58 /pkgs
parent9a0c85ffc5aedc46b4d81f3b9fc22d7f488e3ff9 (diff)
downloadnixpkgs-f29fed8f5c765fbf3fc62d958a336496d72ea484.tar
nixpkgs-f29fed8f5c765fbf3fc62d958a336496d72ea484.tar.gz
nixpkgs-f29fed8f5c765fbf3fc62d958a336496d72ea484.tar.bz2
nixpkgs-f29fed8f5c765fbf3fc62d958a336496d72ea484.tar.lz
nixpkgs-f29fed8f5c765fbf3fc62d958a336496d72ea484.tar.xz
nixpkgs-f29fed8f5c765fbf3fc62d958a336496d72ea484.tar.zst
nixpkgs-f29fed8f5c765fbf3fc62d958a336496d72ea484.zip
webmacs: use GCC instead of clang
clang fails to build webmacs due to numerous errors relating to its use
of the C++ standard library.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/browsers/webmacs/default.nix3
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/webmacs/default.nix b/pkgs/applications/networking/browsers/webmacs/default.nix
index de3c1cfdcdb..2f63670128b 100644
--- a/pkgs/applications/networking/browsers/webmacs/default.nix
+++ b/pkgs/applications/networking/browsers/webmacs/default.nix
@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , mkDerivationWith
 , fetchFromGitHub
 , python3Packages
@@ -6,6 +7,8 @@
 }:
 
 mkDerivationWith python3Packages.buildPythonApplication rec {
+  inherit stdenv;
+
   pname = "webmacs";
   version = "0.8";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e9cc272b44..1f53eeb9e2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36439,7 +36439,9 @@ with pkgs;
 
   webex = callPackage ../applications/networking/instant-messengers/webex { };
 
-  webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs { };
+  webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {
+    stdenv = if stdenv.cc.isClang then gccStdenv else stdenv;
+  };
 
   websploit = python3Packages.callPackage ../tools/security/websploit { };