colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

splatmoji: actually install the .desktop files

Browse Source
This commit is contained in:
Colin
2024-03-01 17:55:27 +00:00
parent fca23e661a
commit 95c95d6f53
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hosts/common/programs/splatmoji.nix
View File

@@ -6,6 +6,9 @@
{ {
sane.programs.splatmoji = { sane.programs.splatmoji = {
packageUnwrapped = pkgs.splatmoji.overrideAttrs (upstream: { packageUnwrapped = pkgs.splatmoji.overrideAttrs (upstream: {
nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
pkgs.copyDesktopItems
];
desktopItems = (upstream.desktopItems or []) ++ [ desktopItems = (upstream.desktopItems or []) ++ [
(pkgs.makeDesktopItem { (pkgs.makeDesktopItem {
name = "splatmoji"; name = "splatmoji";

13
nixpatches/list.nix
View File

@@ -141,12 +141,13 @@ in [
# hash = "sha256-oQEM3EZfAOmfZzDu9faCqyOFZsdHYGn1mVBgkxt68Zg="; # hash = "sha256-oQEM3EZfAOmfZzDu9faCqyOFZsdHYGn1mVBgkxt68Zg=";
# }) # })
(fetchpatch' { # TODO: splatmoji PR is out-of-date
title = "splatmoji: init at 1.2.0"; # (fetchpatch' {
prUrl = "https://github.com/NixOS/nixpkgs/pull/211874"; # title = "splatmoji: init at 1.2.0";
saneCommit = "75149039b6eaf57d8a92164e90aab20eb5d89196"; # prUrl = "https://github.com/NixOS/nixpkgs/pull/211874";
hash = "sha256-abLakAWaRfc8tgu4IwUdR/w8GAuSl+OhQkYozlprD0c="; # saneCommit = "75149039b6eaf57d8a92164e90aab20eb5d89196";
}) # hash = "sha256-abLakAWaRfc8tgu4IwUdR/w8GAuSl+OhQkYozlprD0c=";
# })
# (fetchpatch { # (fetchpatch {
# # stdenv: fix cc for pseudo-crosscompilation # # stdenv: fix cc for pseudo-crosscompilation

6
pkgs/additional/splatmoji/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
owner = "cspeterson"; owner = "cspeterson";
repo = "splatmoji"; repo = "splatmoji";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-fsZ8FhLP3vAalRJWUEi/0fe0DlwAz5zZeRZqAuwgv/U="; hash = "sha256-fsZ8FhLP3vAalRJWUEi/0fe0DlwAz5zZeRZqAuwgv/U=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@@ -33,10 +33,13 @@ stdenv.mkDerivation rec {
''; '';
buildPhase = '' buildPhase = ''
runHook preBuild
./build.sh ${version} dir ./build.sh ${version} dir
runHook postBuild
''; '';
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out mkdir -p $out
cp -R build/usr/* $out cp -R build/usr/* $out
@@ -44,6 +47,7 @@ stdenv.mkDerivation rec {
# splatmoji refers to its lib and data by absolute path # splatmoji refers to its lib and data by absolute path
sed -i "s:/usr/lib/splatmoji:$out/lib/splatmoji:g" $out/bin/splatmoji sed -i "s:/usr/lib/splatmoji:$out/lib/splatmoji:g" $out/bin/splatmoji
sed -i -r "s:/usr/share/+splatmoji:$out/share/splatmoji:g" $out/lib/splatmoji/functions sed -i -r "s:/usr/share/+splatmoji:$out/share/splatmoji:g" $out/lib/splatmoji/functions
runHook postInstall
''; '';
meta = with lib; { meta = with lib; {