diff options
| -rw-r--r-- | pkgs/tools/X11/xdg-utils/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 21 |
2 files changed, 12 insertions, 14 deletions
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 35557ce447f..ed8b1363d5f 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -2,6 +2,7 @@ , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto , w3m, gnugrep, gnused, coreutils, xset, perlPackages , mimiSupport ? false, gawk +, bash , glib , withXdgOpenUsePortalPatch ? true }: @@ -48,6 +49,9 @@ stdenv.mkDerivation rec { # just needed when built from git 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 '' cp ${mimisrc}/xdg-open $out/bin/xdg-open '' + '' @@ -83,6 +87,5 @@ stdenv.mkDerivation rec { license = if mimiSupport then licenses.gpl2 else licenses.free; maintainers = [ maintainers.eelco ]; platforms = platforms.all; - broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c16905e5eb9..77de7cbe9c7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9189,19 +9189,15 @@ with self; { }; }; - FileBaseDir = buildPerlModule { - version = "0.08"; + FileBaseDir = buildPerlPackage { + version = "0.09"; pname = "File-BaseDir"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz"; - hash = "sha256-wGX80+LyKudpk3vMlxuR+AKU1QCfrBQL+6g799NTBeM="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-BaseDir-0.09.tar.gz"; + hash = "sha256-bab3KBVirI8R7xo69q7bUcQRgrYPHxIs7QB579kpZ9k="; }; - configurePhase = '' - runHook preConfigure - perl Build.PL PREFIX="$out" prefix="$out" - ''; propagatedBuildInputs = [ IPCSystemSimple ]; - buildInputs = [ FileWhich ]; + nativeCheckInputs = [ FileWhich ]; meta = { description = "Use the Freedesktop.org base directory specification"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -24142,12 +24138,11 @@ with self; { TestFile = buildPerlPackage { pname = "Test-File"; - version = "1.443"; + version = "1.993"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz"; - hash = "sha256-YbSmq49hfIx7WXUWTPYZRo3DBLa6quo1J4KShvpYvNU="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.993.tar.gz"; + hash = "sha256-7y/+Gq7HtC2HStQR7GR1R7m5vC9fuT5J4zmUiEVq/Ho="; }; - buildInputs = [ Testutf8 ]; meta = { description = "Test file attributes"; homepage = "https://github.com/briandfoy/test-file"; |