Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

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

xdg-utils: support cross compilation

authored by Rick van Schijndel and committed by GitHub 25d41a0e a91401f3

+12 -14
+4 -1
pkgs/tools/X11/xdg-utils/default.nix
··· 2 2 , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto 3 3 , w3m, gnugrep, gnused, coreutils, xset, perlPackages 4 4 , mimiSupport ? false, gawk 5 + , bash 5 6 , glib 6 7 , withXdgOpenUsePortalPatch ? true }: 7 8 ··· 48 49 # just needed when built from git 49 50 nativeBuildInputs = [ libxslt docbook_xml_dtd_412 docbook_xsl xmlto w3m ]; 50 51 52 + # explicitly provide a runtime shell so patchShebangs is consistent across build platforms 53 + buildInputs = [ bash ]; 54 + 51 55 postInstall = lib.optionalString mimiSupport '' 52 56 cp ${mimisrc}/xdg-open $out/bin/xdg-open 53 57 '' + '' ··· 83 87 license = if mimiSupport then licenses.gpl2 else licenses.free; 84 88 maintainers = [ maintainers.eelco ]; 85 89 platforms = platforms.all; 86 - broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); 87 90 }; 88 91 }
+8 -13
pkgs/top-level/perl-packages.nix
··· 9189 9189 }; 9190 9190 }; 9191 9191 9192 - FileBaseDir = buildPerlModule { 9193 - version = "0.08"; 9192 + FileBaseDir = buildPerlPackage { 9193 + version = "0.09"; 9194 9194 pname = "File-BaseDir"; 9195 9195 src = fetchurl { 9196 - url = "mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz"; 9197 - hash = "sha256-wGX80+LyKudpk3vMlxuR+AKU1QCfrBQL+6g799NTBeM="; 9196 + url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-BaseDir-0.09.tar.gz"; 9197 + hash = "sha256-bab3KBVirI8R7xo69q7bUcQRgrYPHxIs7QB579kpZ9k="; 9198 9198 }; 9199 - configurePhase = '' 9200 - runHook preConfigure 9201 - perl Build.PL PREFIX="$out" prefix="$out" 9202 - ''; 9203 9199 propagatedBuildInputs = [ IPCSystemSimple ]; 9204 - buildInputs = [ FileWhich ]; 9200 + nativeCheckInputs = [ FileWhich ]; 9205 9201 meta = { 9206 9202 description = "Use the Freedesktop.org base directory specification"; 9207 9203 license = with lib.licenses; [ artistic1 gpl1Plus ]; ··· 24142 24138 24143 24139 TestFile = buildPerlPackage { 24144 24140 pname = "Test-File"; 24145 - version = "1.443"; 24141 + version = "1.993"; 24146 24142 src = fetchurl { 24147 - url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz"; 24148 - hash = "sha256-YbSmq49hfIx7WXUWTPYZRo3DBLa6quo1J4KShvpYvNU="; 24143 + url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.993.tar.gz"; 24144 + hash = "sha256-7y/+Gq7HtC2HStQR7GR1R7m5vC9fuT5J4zmUiEVq/Ho="; 24149 24145 }; 24150 - buildInputs = [ Testutf8 ]; 24151 24146 meta = { 24152 24147 description = "Test file attributes"; 24153 24148 homepage = "https://github.com/briandfoy/test-file";