bustle: use gettext from nixpkgs #328588
bustle: use gettext from nixpkgs #328588
Conversation
pkgs/by-name/bu/bustle/package.nix
Outdated
| GETTEXT_BIN_DIR = lib.getBin buildPackages.gettext; | ||
| GETTEXT_INCLUDE_DIR = lib.getDev gettext; | ||
| GETTEXT_LIB_DIR = lib.getLib gettext; | ||
| GETTEXT_SYSTEM = true; |
There was a problem hiding this comment.
There was a problem hiding this comment.
It seemed harmless to do unconditionally, but I can make it conditional on Darwin. I’ll do the same for the other PRs that also fix the same issue for other packages.
pkgs/by-name/bu/bustle/package.nix
Outdated
| GETTEXT_BIN_DIR = lib.getBin buildPackages.gettext; | ||
| GETTEXT_INCLUDE_DIR = lib.getDev gettext; | ||
| GETTEXT_LIB_DIR = lib.getLib gettext; |
There was a problem hiding this comment.
I was unable to find docs for cargo:{lib,include} but should not these include /{bin,include,lib} suffixes?
There was a problem hiding this comment.
It’s getting late, so I’ll have to look at it in the morning. The builds succeeded, so either those aren’t needed, or something else is happening.
There was a problem hiding this comment.
I updated the PR to make it conditional on Darwin and specify the correct paths. Since the gettext-system feature is enabled in upstream’s Cargo.lock, I revised the comment and dropped setting the GETTEXT_SYSTEM variable.
The vendored gettext fails to build with clang 16 on Darwin. The gettext in nixpkgs works.
ofborg
bot
added
10.rebuild-linux: 0
Description of changes
The vendored gettext fails to build with clang 16 on Darwin. The gettext in nixpkgs works.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.