diff options
| author | Rick van Schijndel <Mindavi@users.noreply.github.com> | 2023-09-11 23:44:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-11 23:44:11 +0200 |
| commit | 25d41a0eaa4e70ccbc19c651505f7013f305df90 (patch) | |
| tree | 59f1f6d8f4d5e35e2d6022c773f663d0e7d03a35 /pkgs/tools/X11 | |
| parent | a91401f3100d41a6fe305294188bfcdf65ffda96 (diff) | |
| parent | a227fd1fe78ec19e7d823ef808830e86a705fc12 (diff) | |
| download | nixpkgs-25d41a0eaa4e70ccbc19c651505f7013f305df90.tar nixpkgs-25d41a0eaa4e70ccbc19c651505f7013f305df90.tar.gz nixpkgs-25d41a0eaa4e70ccbc19c651505f7013f305df90.tar.bz2 nixpkgs-25d41a0eaa4e70ccbc19c651505f7013f305df90.tar.lz nixpkgs-25d41a0eaa4e70ccbc19c651505f7013f305df90.tar.xz nixpkgs-25d41a0eaa4e70ccbc19c651505f7013f305df90.tar.zst nixpkgs-25d41a0eaa4e70ccbc19c651505f7013f305df90.zip | |
Merge pull request #246954 from uninsane/pr-xdg-utils-cross
xdg-utils: support cross compilation
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/xdg-utils/default.nix | 5 |
1 files changed, 4 insertions, 1 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); }; } |