BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #142415 from Artturin/crossfixes1

Browse source
This commit is contained in:
Sandro 2021-10-26 17:24:01 +02:00 committed by GitHub
commit 2558d8e64f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/tools/inputmethods/m17n-db/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gettext }:
{ lib, stdenv, fetchurl, gettext, gawk, bash }:
stdenv.mkDerivation rec {
pname = "m17n-db";
@ -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"

7
pkgs/tools/inputmethods/m17n-lib/default.nix
View file

@ -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";
@ -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 = {

42
pkgs/tools/inputmethods/m17n-lib/otf.nix
View file

@ -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/";