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

cosmic-edit: unstable-2023-11-29 -> 0-unstable-2024-01-12

Browse Source
This commit is contained in:
Aaron Honeycutt 2024-01-12 10:14:05 -07:00
parent cdcd061e7f
commit ca140ccf92
3 changed files with 636 additions and 516 deletions
pkgs/by-name/co
cosmic-edit
Cargo.lockpackage.nix
cosmic-term
package.nix

1120
pkgs/by-name/co/cosmic-edit/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

26
pkgs/by-name/co/cosmic-edit/package.nix
View File

@ -2,7 +2,6 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
rust,
rustPlatform, rustPlatform,
cmake, cmake,
makeBinaryWrapper, makeBinaryWrapper,
@ -21,13 +20,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cosmic-edit"; pname = "cosmic-edit";
version = "unstable-2023-11-29"; version = "0-unstable-2024-01-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pop-os"; owner = "pop-os";
repo = pname; repo = pname;
rev = "4a3dd101f35eb3c1c585f104d78ed4ee31d393d3"; rev = "c1944f9c15812ce842c91a77e228cc22a0f49f18";
hash = "sha256-pk+4u13oWZ4fgXy1tlDgq+E4J+UddjTNSexMm4dgBSo="; hash = "sha256-wJnBfBQKYmpJBSboGKtlwew17clE60ac2AismIe1XaA=";
}; };
cargoLock = { cargoLock = {
@ -35,8 +34,10 @@ rustPlatform.buildRustPackage rec {
outputHashes = { outputHashes = {
"accesskit-0.11.0" = "sha256-xVhe6adUb8VmwIKKjHxwCwOo5Y1p3Or3ylcJJdLDrrE="; "accesskit-0.11.0" = "sha256-xVhe6adUb8VmwIKKjHxwCwOo5Y1p3Or3ylcJJdLDrrE=";
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
"cosmic-config-0.1.0" = "sha256-wBliqZbRHYiwZmu0vHeIP5DFzg/1IeQP3aMxiYC88bo="; "cosmic-config-0.1.0" = "sha256-GHjoLGF9hFJRpf5i+TwflRnh8N+oWyWZ9fqgRFLXQsw=";
"cosmic-text-0.10.0" = "sha256-fE5HkhITLw0OBfFLFMsKEJw5idO265i4S7qylHTt7C0="; "cosmic-syntax-theme-0.1.0" = "sha256-9Vf2s5Ry2hco80EbXOuVLwvOWygRiuaRD4tTImWooSg=";
"cosmic-text-0.10.0" = "sha256-PHz5jUecK889E88Y20XUe2adTUO8ElnoV7IIcaohMUw=";
"glyphon-0.3.0" = "sha256-JGkNIfj1HjOF8kGxqJPNq/JO+NhZD6XrZ4KmkXEP6Xc=";
"sctk-adwaita-0.5.4" = "sha256-yK0F2w/0nxyKrSiHZbx7+aPNY2vlFs7s8nu/COp2KqQ="; "sctk-adwaita-0.5.4" = "sha256-yK0F2w/0nxyKrSiHZbx7+aPNY2vlFs7s8nu/COp2KqQ=";
"softbuffer-0.3.3" = "sha256-eKYFVr6C1+X6ulidHIu9SP591rJxStxwL9uMiqnXx4k="; "softbuffer-0.3.3" = "sha256-eKYFVr6C1+X6ulidHIu9SP591rJxStxwL9uMiqnXx4k=";
"smithay-client-toolkit-0.16.1" = "sha256-z7EZThbh7YmKzAACv181zaEZmWxTrMkFRzP0nfsHK6c="; "smithay-client-toolkit-0.16.1" = "sha256-z7EZThbh7YmKzAACv181zaEZmWxTrMkFRzP0nfsHK6c=";
@ -50,12 +51,7 @@ rustPlatform.buildRustPackage rec {
substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
''; '';
nativeBuildInputs = [ nativeBuildInputs = [ just pkg-config makeBinaryWrapper ];
cmake
just
pkg-config
makeBinaryWrapper
];
buildInputs = [ buildInputs = [
libxkbcommon libxkbcommon
xorg.libX11 xorg.libX11
@ -75,9 +71,7 @@ rustPlatform.buildRustPackage rec {
(placeholder "out") (placeholder "out")
"--set" "--set"
"bin-src" "bin-src"
"target/${ "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-edit"
rust.lib.toRustTargetSpecShort stdenv.hostPlatform
}/release/cosmic-edit"
]; ];
# LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2 # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
@ -91,7 +85,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/pop-os/cosmic-edit"; homepage = "https://github.com/pop-os/cosmic-edit";
description = "Text Editor for the COSMIC Desktop Environment"; description = "Text Editor for the COSMIC Desktop Environment";
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = with maintainers; [ ahoneybun ]; maintainers = with maintainers; [ ahoneybun nyanbinary ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

6
pkgs/by-name/co/cosmic-term/package.nix
View File

@ -10,8 +10,6 @@
just, just,
pkg-config, pkg-config,
libxkbcommon, libxkbcommon,
glib,
gtk3,
libinput, libinput,
fontconfig, fontconfig,
freetype, freetype,
@ -63,8 +61,6 @@ rustPlatform.buildRustPackage rec {
fontconfig fontconfig
freetype freetype
wayland wayland
glib
gtk3
]; ];
dontUseJustBuild = true; dontUseJustBuild = true;
@ -84,7 +80,7 @@ rustPlatform.buildRustPackage rec {
postInstall = '' postInstall = ''
wrapProgram "$out/bin/${pname}" \ wrapProgram "$out/bin/${pname}" \
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \ --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 wayland libxkbcommon ]} --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi wayland libxkbcommon ]}
''; '';
meta = with lib; { meta = with lib; {