diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-10 19:00:06 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-10 19:01:27 +0100 |
| commit | f3618342ece994482697892133532a380a04cd0f (patch) | |
| tree | bd6067d893770d9f7d272aaa5c5968ff517769d0 /pkgs/build-support/make-desktopitem/default.nix | |
| parent | 5e7e4c93a9a93c12d5eaa3a91e289d18195aaa75 (diff) | |
| parent | 2ff8cef0a4c969b9c377db4e0fe6eb8f5404e0b4 (diff) | |
| download | nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.gz nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.bz2 nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.lz nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.xz nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.zst nixpkgs-f3618342ece994482697892133532a380a04cd0f.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support/make-desktopitem/default.nix')
| -rw-r--r-- | pkgs/build-support/make-desktopitem/default.nix | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index f8c31ed5c1d..67b82fd66db 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib}: +{ lib, runCommandLocal }: { name , type ? "Application" , exec @@ -13,24 +13,20 @@ , extraEntries ? null }: -stdenv.mkDerivation { - name = "${name}.desktop"; +let + optionalEntriesList = [{k="Icon"; v=icon;} + {k="Comment"; v=comment;} + {k="GenericName"; v=genericName;} + {k="MimeType"; v=mimeType;} + {k="StartupNotify"; v=startupNotify;}]; - buildCommand = let + valueNotNull = {k, v}: v != null; + entriesToKeep = builtins.filter valueNotNull optionalEntriesList; - optionalEntriesList = [{k="Icon"; v=icon;} - {k="Comment"; v=comment;} - {k="GenericName"; v=genericName;} - {k="MimeType"; v=mimeType;} - {k="StartupNotify"; v=startupNotify;}]; - - valueNotNull = {k, v}: v != null; - entriesToKeep = builtins.filter valueNotNull optionalEntriesList; - - mkEntry = {k, v}: k + "=" + v; - optionalEntriesString = lib.concatMapStringsSep "\n" mkEntry entriesToKeep; - - in + mkEntry = {k, v}: k + "=" + v; + optionalEntriesString = lib.concatMapStringsSep "\n" mkEntry entriesToKeep; +in +runCommandLocal "${name}.desktop" {} '' mkdir -p $out/share/applications cat > $out/share/applications/${name}.desktop <<EOF @@ -44,5 +40,4 @@ stdenv.mkDerivation { ${if extraEntries == null then ''EOF'' else '' ${extraEntries} EOF''} - ''; -} + '' |