diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-11-10 15:18:19 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-11-10 15:18:19 +0100 |
commit | afabc4a15d5ba6631bd4d865b8be37fc67d52809 (patch) | |
tree | 2342d9e8bd8b4cfbfee2b9a98c088df9f1c809ca /pkgs/applications/window-managers/cosmic/settings/default.nix | |
parent | 9a0c85ffc5aedc46b4d81f3b9fc22d7f488e3ff9 (diff) | |
parent | 714e527a726c9613fca8e13586a1b19198d68d9b (diff) | |
download | nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.gz nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.bz2 nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.lz nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.xz nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.zst nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.zip |
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts: pkgs/development/libraries/SDL2/default.nix
Diffstat (limited to 'pkgs/applications/window-managers/cosmic/settings/default.nix')
-rw-r--r-- | pkgs/applications/window-managers/cosmic/settings/default.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/applications/window-managers/cosmic/settings/default.nix b/pkgs/applications/window-managers/cosmic/settings/default.nix index 6767f9638462..dcb454b3f82c 100644 --- a/pkgs/applications/window-managers/cosmic/settings/default.nix +++ b/pkgs/applications/window-managers/cosmic/settings/default.nix @@ -3,8 +3,9 @@ , fetchFromGitHub , rust , rustPlatform -, cargo , cmake +, makeWrapper +, cosmic-icons , just , pkg-config , libxkbcommon @@ -19,13 +20,13 @@ , util-linuxMinimal }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "cosmic-settings"; version = "unstable-2023-10-26"; src = fetchFromGitHub { owner = "pop-os"; - repo = "cosmic-settings"; + repo = pname; rev = "d15ebbd340dee7adf184831311b5da73faaa80f5"; hash = "sha256-OlQ2jjT/ygO+hpl5Cc3h8Yp/SVo+pmI/EH7pqvY9GXI="; }; @@ -50,7 +51,7 @@ rustPlatform.buildRustPackage { substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" ''; - nativeBuildInputs = [ cmake just pkg-config which lld util-linuxMinimal ]; + nativeBuildInputs = [ cmake just pkg-config which lld util-linuxMinimal makeWrapper ]; buildInputs = [ libxkbcommon libinput fontconfig freetype wayland expat udev ]; dontUseJustBuild = true; @@ -64,6 +65,11 @@ rustPlatform.buildRustPackage { "target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-settings" ]; + postInstall = '' + wrapProgram "$out/bin/cosmic-settings" \ + --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" + ''; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-settings"; description = "Settings for the COSMIC Desktop Environment"; |