b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #246954 from uninsane/pr-xdg-utils-cross

Browse source 
xdg-utils: support cross compilation
This commit is contained in:
Rick van Schijndel 2023-09-11 23:44:11 +02:00 committed by GitHub
parent a91401f310 a227fd1fe7
commit 25d41a0eaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/tools/X11/xdg-utils/default.nix
View file

@ -2,6 +2,7 @@
, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto
, w3m, gnugrep, gnused, coreutils, xset, perlPackages , w3m, gnugrep, gnused, coreutils, xset, perlPackages
, mimiSupport ? false, gawk , mimiSupport ? false, gawk
, bash
, glib , glib
, withXdgOpenUsePortalPatch ? true }: , withXdgOpenUsePortalPatch ? true }:
@ -48,6 +49,9 @@ stdenv.mkDerivation rec {
# just needed when built from git # just needed when built from git
nativeBuildInputs = [ libxslt docbook_xml_dtd_412 docbook_xsl xmlto w3m ]; nativeBuildInputs = [ libxslt docbook_xml_dtd_412 docbook_xsl xmlto w3m ];
# explicitly provide a runtime shell so patchShebangs is consistent across build platforms
buildInputs = [ bash ];
postInstall = lib.optionalString mimiSupport '' postInstall = lib.optionalString mimiSupport ''
cp ${mimisrc}/xdg-open $out/bin/xdg-open cp ${mimisrc}/xdg-open $out/bin/xdg-open
'' + '' '' + ''
@ -83,6 +87,5 @@ stdenv.mkDerivation rec {
license = if mimiSupport then licenses.gpl2 else licenses.free; license = if mimiSupport then licenses.gpl2 else licenses.free;
maintainers = [ maintainers.eelco ]; maintainers = [ maintainers.eelco ];
platforms = platforms.all; platforms = platforms.all;
broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
}; };
} }

21
pkgs/top-level/perl-packages.nix
View file

@ -9189,19 +9189,15 @@ with self; {
}; };
}; };
FileBaseDir = buildPerlModule { FileBaseDir = buildPerlPackage {
version = "0.08"; version = "0.09";
pname = "File-BaseDir"; pname = "File-BaseDir";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz"; url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-BaseDir-0.09.tar.gz";
hash = "sha256-wGX80+LyKudpk3vMlxuR+AKU1QCfrBQL+6g799NTBeM="; hash = "sha256-bab3KBVirI8R7xo69q7bUcQRgrYPHxIs7QB579kpZ9k=";
}; };
configurePhase = ''
runHook preConfigure
perl Build.PL PREFIX="$out" prefix="$out"
'';
propagatedBuildInputs = [ IPCSystemSimple ]; propagatedBuildInputs = [ IPCSystemSimple ];
buildInputs = [ FileWhich ]; nativeCheckInputs = [ FileWhich ];
meta = { meta = {
description = "Use the Freedesktop.org base directory specification"; description = "Use the Freedesktop.org base directory specification";
license = with lib.licenses; [ artistic1 gpl1Plus ]; license = with lib.licenses; [ artistic1 gpl1Plus ];
@ -24142,12 +24138,11 @@ with self; {
TestFile = buildPerlPackage { TestFile = buildPerlPackage {
pname = "Test-File"; pname = "Test-File";
version = "1.443"; version = "1.993";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz"; url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.993.tar.gz";
hash = "sha256-YbSmq49hfIx7WXUWTPYZRo3DBLa6quo1J4KShvpYvNU="; hash = "sha256-7y/+Gq7HtC2HStQR7GR1R7m5vC9fuT5J4zmUiEVq/Ho=";
}; };
buildInputs = [ Testutf8 ];
meta = { meta = {
description = "Test file attributes"; description = "Test file attributes";
homepage = "https://github.com/briandfoy/test-file"; homepage = "https://github.com/briandfoy/test-file";