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

Various cross improvements #142415

Merged
merged 4 commits into from
Oct 26, 2021
Merged

Various cross improvements #142415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be3d12d
libotf: fix cross-compilation by applying a patch from debian
Artturin Oct 20, 2021
c5ef7d7
m17n-db: fix cross-compilation
Artturin Oct 21, 2021
a354a24
m17n-lib: fix cross-compilation
Artturin Oct 21, 2021
e937fd5
libotf: format
SuperSandro2000 Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions pkgs/tools/inputmethods/m17n-db/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gettext }:
{ lib, stdenv, fetchurl, gettext, gawk, bash }:

stdenv.mkDerivation rec {
pname = "m17n-db";
Expand All @@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5";
};

buildInputs = [ gettext ];
nativeBuildInputs = [ gettext ];
buildInputs = [ gettext gawk bash ];

strictDeps = true;

configureFlags = lib.optional (stdenv ? glibc)
"--with-charmaps=${stdenv.glibc.out}/share/i18n/charmaps"
Expand Down
7 changes: 6 additions & 1 deletion pkgs/tools/inputmethods/m17n-lib/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, m17n_db}:
{ lib, stdenv, fetchurl, m17n_db, autoreconfHook, pkg-config }:
stdenv.mkDerivation rec {
pname = "m17n-lib";
version = "1.8.0";
Expand All @@ -8,6 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq";
};

strictDeps = true;

# reconf needed to sucesfully cross-compile
nativeBuildInputs = [ autoreconfHook pkg-config ];

buildInputs = [ m17n_db ];

meta = {
Expand Down
42 changes: 33 additions & 9 deletions pkgs/tools/inputmethods/m17n-lib/otf.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,46 @@
{ lib, stdenv, fetchurl, libXaw, freetype }:
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, libXaw, freetype }:

stdenv.mkDerivation rec {
name = "libotf-0.9.16";
pname = "libotf";
version = "0.9.16";

src = fetchurl {
url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
url = "https://download.savannah.gnu.org/releases/m17n/${pname}-${version}.tar.gz";
sha256 = "0sq6g3xaxw388akws6qrllp3kp2sxgk2dv4j79k6mm52rnihrnv8";
};

outputs = [ "out" "dev" ];
patches = [
# https://salsa.debian.org/debian/libotf/-/tree/master/debian/patches
# Fix cross-compilation
(fetchpatch {
url = "https://salsa.debian.org/debian/libotf/-/raw/1be04cedf887720eb8f5efb3594dc2cefd96b1f1/debian/patches/0002-use-pkg-config-not-freetype-config.patch";
sha256 = "sha256-VV9iGoNWIEie6UiLLTJBD+zxpvj0acgqkcBeAN1V6Kc=";
})
# these 2 are required by the above patch
(fetchpatch {
url = "https://salsa.debian.org/debian/libotf/-/raw/1be04cedf887720eb8f5efb3594dc2cefd96b1f1/debian/patches/0001-do-not-add-flags-for-required-packages-to-pc-file.patch";
sha256 = "sha256-3kzqNPAHNVJQ1F4fyifq3AqLdChWli/k7wOq+ha+iDs=";
})
(fetchpatch {
url = "https://salsa.debian.org/debian/libotf/-/raw/1be04cedf887720eb8f5efb3594dc2cefd96b1f1/debian/patches/0001-libotf-config-modify-to-support-multi-arch.patch";
sha256 = "sha256-SUlI87h+MtYWWtrAegzAnSds8JhxZwTJltDcj/se/Qc=";
})
];

strictDeps = true;

nativeBuildInputs = [ pkg-config autoreconfHook ];

buildInputs = [ libXaw freetype ];

postInstall =
''
mkdir -p $dev/bin
mv $out/bin/libotf-config $dev/bin/
'';
outputs = [ "out" "dev" ];

postInstall = ''
mkdir -p $dev/bin
mv $out/bin/libotf-config $dev/bin/
substituteInPlace $dev/bin/libotf-config \
--replace "pkg-config" "${pkg-config}/bin/pkg-config"
'';

meta = {
homepage = "https://www.nongnu.org/m17n/";
Expand Down