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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

fontforge: Fix uninterpolated CMAKE_INSTALL_PREFIX in RPATH. #94126

Merged
merged 1 commit into from
Jul 30, 2020
Merged

fontforge: Fix uninterpolated CMAKE_INSTALL_PREFIX in RPATH. #94126

merged 1 commit into from
Jul 30, 2020

Conversation

nh2
Copy link
Contributor

@nh2 nh2 commented Jul 29, 2020

Motivation for this change

This was introduced in #89583
and fixed upstream with a master-only patch in
fontforge/fontforge#4232.

Found via nh2/static-haskell-nix#98 (comment).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

CC @alyssais from #89583

@nh2 nh2 requested a review from alyssais July 29, 2020 03:27
@nh2 nh2 self-assigned this Jul 29, 2020
@nh2 nh2 mentioned this pull request Jul 29, 2020
Merged
5 tasks
@ofborg ofborg bot requested a review from erictapen July 29, 2020 03:36
@erictapen
Copy link
Member

Could you target the staging branch? fontforge rebuilds a lot.

@nh2 nh2 force-pushed the fontforge-fix-cmake-rpath branch from a9bfc61 to c4c8125 Compare July 29, 2020 23:40
@nh2 nh2 changed the base branch from master to staging July 29, 2020 23:40
@nh2
Copy link
Contributor Author

nh2 commented Jul 29, 2020

Could you target the staging branch? fontforge rebuilds a lot.

Done.

@nh2
Copy link
Contributor Author

nh2 commented Jul 29, 2020 •
edited
Loading

✔️ Builds and runs fine for me on staging.

nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Jul 30, 2020
@nh2
nixpkgs: Update submodule:
afa2b62 
* include workaround for NixOS/nixpkgs#85924
* musl 1.2.0 (#98 (comment))
* workaround for fontforge execution failure due to wrong RPATH (NixOS/nixpkgs#94126)
* ilmbase musl compilation error
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Jul 30, 2020
@nh2
nixpkgs: Update submodule:
0e1002a 
* include workaround for NixOS/nixpkgs#85924
* musl 1.2.0 (#98 (comment))
* workaround for fontforge execution failure due to wrong RPATH (NixOS/nixpkgs#94126)
* ilmbase musl compilation error (NixOS/nixpkgs#94205)
* mesa: Fix `-Werror=int-conversion` build error on musl

fixup! nixpkgs: Update submodule:
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Jul 30, 2020
@nh2
nixpkgs: Update submodule:
76cc600 
* include workaround for NixOS/nixpkgs#85924
* musl 1.2.0 (#98 (comment))
* workaround for fontforge execution failure due to wrong RPATH (NixOS/nixpkgs#94126)
* ilmbase musl compilation error (NixOS/nixpkgs#94205)
* mesa: Fix `-Werror=int-conversion` build error on musl (NixOS/nixpkgs#94207)
erictapen
erictapen approved these changes Jul 30, 2020
View reviewed changes
Copy link
Member

@erictapen erictapen left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I built fontforge-gtk yesterday when the commit was based on master, so I guess this is fine to merge on staging.

@nh2 nh2 merged commit 5d6aa8b into NixOS:staging Jul 30, 2020
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Jul 5, 2021
@nh2
nixpkgs: Update submodule:
d759e3d 
* include fixes for GHC segfaulting: (NixOS/nixpkgs#129247, NixOS/nixpkgs#129289)
* musl 1.2.2, including this important fix from musl 1.2.0:
  #98 (comment)
* workaround for fontforge execution failure due to wrong RPATH:
  NixOS/nixpkgs#94126
* ilmbase musl compilation error:
  NixOS/nixpkgs#94205
* mesa: Fix `-Werror=int-conversion` build error on musl:
  NixOS/nixpkgs#94207
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Jul 6, 2021
@nh2
nixpkgs: Update submodule:
eb2a627 
* include fixes for GHC segfaulting: (NixOS/nixpkgs#129247, NixOS/nixpkgs#129289)
* musl 1.2.2, including this important fix from musl 1.2.0:
  #98 (comment)
* workaround for fontforge execution failure due to wrong RPATH:
  NixOS/nixpkgs#94126
* ilmbase musl compilation error:
  NixOS/nixpkgs#94205
* mesa: Fix `-Werror=int-conversion` build error on musl:
  NixOS/nixpkgs#94207

survey:

* Update file in which stackage packages are listed.
  See nixpkgs commit

      7f236bd4 - hackage2nix: Split configuration, auto disable hydra builds
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Jul 20, 2021
@nh2
nixpkgs: Update submodule:
e75cff5 
* include fixes for GHC segfaulting: (NixOS/nixpkgs#129247, NixOS/nixpkgs#129289)
* musl 1.2.2, including this important fix from musl 1.2.0:
  #98 (comment)
* workaround for fontforge execution failure due to wrong RPATH:
  NixOS/nixpkgs#94126
* ilmbase musl compilation error:
  NixOS/nixpkgs#94205
* mesa: Fix `-Werror=int-conversion` build error on musl:
  NixOS/nixpkgs#94207

survey:

* Update file in which stackage packages are listed.
  See nixpkgs commit

      7f236bd4 - hackage2nix: Split configuration, auto disable hydra builds
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erictapen erictapen erictapen approved these changes

@alyssais alyssais Awaiting requested review from alyssais

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@mmahut mmahut Awaiting requested review from mmahut

Assignees

@nh2 nh2

Labels
6.topic: python 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nh2 @erictapen