public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make-desktopitem: desktop-file-utils is a nativeBuildInput

Browse Source 
This fixes cross-compilation of a NixOS with the manual enabled.
This commit is contained in:
Florian Klink 2020-11-27 01:16:24 +01:00
parent bd1de18f6c
commit ae5764621d
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/build-support/make-desktopitem/default.nix
View File

@ -16,10 +16,10 @@
, extraEntries ? "" # Extra configuration. Will be appended to the end of the file and may thus contain extra sections , extraEntries ? "" # Extra configuration. Will be appended to the end of the file and may thus contain extra sections
, fileValidation ? true # whether to validate resulting desktop file. , fileValidation ? true # whether to validate resulting desktop file.
}: }:
let let
# like builtins.toString, but null -> null instead of null -> "" # like builtins.toString, but null -> null instead of null -> ""
nullableToString = value: if value == null then null nullableToString = value:
if value == null then null
else if builtins.isBool value then lib.boolToString value else if builtins.isBool value then lib.boolToString value
else builtins.toString value; else builtins.toString value;
@ -48,7 +48,10 @@ let
) )
++ (if extraEntries == "" then [ ] else [ "${extraEntries}" ]); ++ (if extraEntries == "" then [ ] else [ "${extraEntries}" ]);
in in
runCommandLocal "${name}.desktop" {} runCommandLocal "${name}.desktop"
{
nativeBuildInputs = [ desktop-file-utils ];
}
('' (''
mkdir -p "$out/share/applications" mkdir -p "$out/share/applications"
cat > "$out/share/applications/${name}.desktop" <<EOF cat > "$out/share/applications/${name}.desktop" <<EOF
@ -56,5 +59,5 @@ runCommandLocal "${name}.desktop" {}
EOF EOF
'' + lib.optionalString fileValidation '' '' + lib.optionalString fileValidation ''
echo "Running desktop-file validation" echo "Running desktop-file validation"
${desktop-file-utils}/bin/desktop-file-validate "$out/share/applications/${name}.desktop" desktop-file-validate "$out/share/applications/${name}.desktop"
'') '')