Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

pidgin: fix build on darwin, add mainProgram #310923

Merged
merged 1 commit into from May 12, 2024

Conversation

lucasew
Copy link
Contributor

@lucasew lucasew commented May 11, 2024

Description of changes

I don't have anything darwin here and I am the only maintainer of pidgin.

ZHF #309482

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 馃憤 reaction to pull requests you find important.

@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels May 11, 2024
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the diff below fixes the clang build. (tested on x64 darwin). can probably also test using pkgsLLVM.pidgin on linux, but that needs to build a bunch of stuff so i didn't try.

ignore clang error.diff
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 211c5b49bf9a..4274935caf5f 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -107,7 +107,8 @@ let
     ]
     ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ]
     ++ lib.optionals withGnutls [ "--enable-gnutls=yes" "--enable-nss=no" ]
-    ++ lib.optionals stdenv.isDarwin [ "--disable-gtkspell" "--disable-vv" ];
+    ++ lib.optionals stdenv.isDarwin [ "--disable-gtkspell" "--disable-vv" ]
+    ++ lib.optionals stdenv.cc.isClang [ "CFLAGS=-Wno-error=int-conversion" ];
 
     enableParallelBuilding = true;
 

@lucasew lucasew force-pushed the 20240511-pidgin-broken-darwin branch from 8fab934 to c4b50d2 Compare May 12, 2024 13:04
@lucasew lucasew changed the title pidgin: mark as broken on darwin pidgin: fix build on darwin, add mainProgram May 12, 2024
@lucasew
Copy link
Contributor Author

lucasew commented May 12, 2024

the diff below fixes the clang build. (tested on x64 darwin). can probably also test using pkgsLLVM.pidgin on linux, but that needs to build a bunch of stuff so i didn't try.

ignore clang error.diff

I applied that change. Can you run nixpkgs-review on this PR?

@lucasew
Copy link
Contributor Author

lucasew commented May 12, 2024

@ofborg build pidgin

@lucasew
Copy link
Contributor Author

lucasew commented May 12, 2024

Result of nixpkgs-review pr 310923 run on x86_64-linux 1

@wegank
Copy link
Member

wegank commented May 12, 2024

Result of nixpkgs-review pr 310923 run on aarch64-darwin 1

1 package marked as broken and skipped:
  • pidginPackages.tdlib-purple
1 package failed to build:
  • telepathy-haze
2 packages built:
  • pidgin (pidginPackages.pidgin)
  • pidginPackages.purple-matrix

@wegank wegank merged commit d76bddb into NixOS:master May 12, 2024
29 of 32 checks passed
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Result of nixpkgs-review pr 310923 run on x86_64-darwin 1

1 package marked as broken and skipped:
  • pidginPackages.tdlib-purple
1 package failed to build:
  • telepathy-haze
2 packages built:
  • pidgin (pidginPackages.pidgin)
  • pidginPackages.purple-matrix

telepathy-haze fails due to unrelated compile error.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants