Package the (Pop!_OS) COSMIC Desktop Environment #144411
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| { lib, fetchFromGitHub, gnome, pop-desktop-widget, grilo }: | ||
|
|
||
| gnome.gnome-control-center.overrideAttrs (old: rec { | ||
| pname = "pop-control-center"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "pop-os"; | ||
| repo = "gnome-control-center"; | ||
| # from branch `master_impish` | ||
| rev = "2dafb76ab69cf4c93e6dd8920c0e10b7cacf0d0f"; | ||
| sha256 = "sha256-SSu3eaSB+4dZNQvsOiQiviHqM+eo4PQkNH97oG3xecc="; | ||
| }; | ||
|
|
||
| buildInputs = old.buildInputs ++ [ grilo pop-desktop-widget ]; | ||
|
|
||
| patches = let | ||
| patchDir = "${src}/debian/patches"; | ||
| in old.patches ++ [ | ||
| # "${patchDir}/pop/pop-allow-sound-above-100.patch" | ||
| "${patchDir}/pop/pop-mouse-accel.patch" | ||
| "${patchDir}/pop/pop-shop.patch" | ||
| # "${patchDir}/pop/pop-upgrade.patch" | ||
| # "${patchDir}/pop/pop-hidpi.patch" | ||
| # "${patchDir}/pop/system76-firmware.patch" | ||
| "${patchDir}/pop/pop-alert-sound.patch" | ||
| "${patchDir}/pop/remove-diagnostics.patch" | ||
| # "${patchDir}/pop/gsettings-desktop-schemas-version.patch" | ||
| "${patchDir}/pop/0001-mouse-Add-Disable-While-Typing-toggle-for-touchpad.patch" | ||
| "${patchDir}/pop/0001-Do-not-enforce-password-strength-requirements.patch" | ||
| "${patchDir}/pop/0002-users-Recreate-RunHandler-on-failure.patch" | ||
| "${patchDir}/pop/cc-search-locations-dialog.patch" | ||
| "${patchDir}/pop/0001-shell-Fix-bug-when-multiple-panels-use-custom-sideba.patch" | ||
| "${patchDir}/pop/pop-desktop-widget.patch" | ||
| "${patchDir}/pop/pop-no-search.patch" | ||
| "${patchDir}/pop/0001-keyboard-Pop-_OS-changes-with-support-for-multiple-b.patch" | ||
| ]; | ||
|
|
||
| meta = with lib; { | ||
| description = "Modular IPC-based desktop launcher service for Pop!_OS"; | ||
| maintainers = with maintainers; [ Enzime ]; | ||
| license = licenses.gpl3; | ||
| homepage = "https://github.com/pop-os/gnome-control-center"; | ||
| }; | ||
| }) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| { stdenv, fetchFromGitHub, rustPlatform, lib, pkg-config, glib, gst_all_1, gtk3, libhandy }: | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| pname = "pop-desktop-widget"; | ||
| version = "unstable-2021-11-03"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "pop-os"; | ||
| repo = "desktop-widget"; | ||
| rev = "1652fc89aa16dcf652422c4c3dfe1095e6286b7d"; | ||
| sha256 = "sha256-QBQBtBSj+J87yAQhYMOrJTUCee3ebJhVc4Y/7EyBDes="; | ||
| }; | ||
|
|
||
| cargoDeps = rustPlatform.fetchCargoTarball { | ||
|
There was a problem hiding this comment. Why are you not using the rustPlatform mkDerivation? There was a problem hiding this comment. This is because There was a problem hiding this comment. That most likely won't work with nix and we need to replicate that in the right rustPlaform function. There was a problem hiding this comment. We have plenty of packages that use Make or Ninja to run cargo, and they work fine. Is there a specific problem you've noticed here? |
||
| inherit src; | ||
| name = "${pname}-${version}"; | ||
| hash = "sha256-/Sa/eImZZ+XeeCJueZOEhAmz0MA9yjW58jbFmXk4HL0="; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ pkg-config glib rustPlatform.cargoSetupHook rustPlatform.rust.cargo ]; | ||
| buildInputs = [ gst_all_1.gstreamer gtk3 libhandy ]; | ||
|
|
||
| installFlags = [ "prefix=$(out)" "DESTDIR=" ]; | ||
|
|
||
| meta = with lib; { | ||
| description = "GTK desktop settings widget for Pop!_OS"; | ||
| maintainers = with maintainers; [ Enzime ]; | ||
| license = licenses.mit; | ||
| homepage = "https://github.com/pop-os/desktop-widget"; | ||
| }; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/Makefile b/Makefile | ||
| index 433728e..065d328 100644 | ||
| --- a/Makefile | ||
| +++ b/Makefile | ||
| @@ -2,7 +2,7 @@ TARGET = debug | ||
| DEBUG ?= 0 | ||
|
|
||
| ifeq ($(DESTDIR),) | ||
| -BASE_PATH = $(HOME)/.local | ||
| +BASE_PATH ?= $(HOME)/.local | ||
| LIB_PATH = $(BASE_PATH)/share | ||
| else | ||
| BASE_PATH = $(DESTDIR)/usr |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| { stdenv, fetchFromGitHub, rustPlatform, lib, pkg-config, openssl, gtk3 }: | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| pname = "pop-launcher"; | ||
| version = "1.0.3"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "pop-os"; | ||
| repo = "launcher"; | ||
| rev = version; | ||
| sha256 = "sha256-eo/4ou9cW27IxS5C5l+KV6DU1gbe+Vbv9oVTTHPx0uI="; | ||
| }; | ||
|
|
||
| patches = [ ./custom-base-path.patch ]; | ||
|
|
||
| cargoDeps = rustPlatform.fetchCargoTarball { | ||
| inherit src; | ||
| name = "${pname}-${version}"; | ||
| hash = "sha256-47s9tE2SImf8VhiKUXI4Kkk0ctamVktCKQsM8WpJOJM="; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ pkg-config rustPlatform.cargoSetupHook rustPlatform.rust.cargo ]; | ||
| buildInputs = [ openssl gtk3 ]; | ||
|
|
||
| installFlags = [ "BASE_PATH=$(out)" ]; | ||
|
|
||
| meta = with lib; { | ||
| description = "Modular IPC-based desktop launcher service for Pop!_OS"; | ||
| maintainers = with maintainers; [ Enzime ]; | ||
| license = licenses.mpl20; | ||
| homepage = "https://github.com/pop-os/launcher"; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| { lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, gtk3 }: | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| pname = "pop-shell-shortcuts"; | ||
| version = "unstable-2021-10-02"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "pop-os"; | ||
| repo = "shell-shortcuts"; | ||
| rev = "005f76c8e59d924a7edb59a2d08030d439b7fd45"; | ||
| sha256 = "sha256-/o6sQ/EieIbZrD7p1dwYOQ+uBsk+zf3vjnPXOcD890Q="; | ||
| }; | ||
|
|
||
| cargoDeps = rustPlatform.fetchCargoTarball { | ||
| inherit src; | ||
| name = "${pname}-${version}"; | ||
| hash = "sha256-SySh4/xjP+KnuL3x+IFQUyLgpI3hyshi3h8L5m5ZXOk="; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ pkg-config rustPlatform.cargoSetupHook rustPlatform.rust.cargo ]; | ||
| buildInputs = [ gtk3 ]; | ||
|
|
||
| installFlags = [ "prefix=$(out)" "DESTDIR=" ]; | ||
|
|
||
| meta = with lib; { | ||
| description = "Application for displaying and demoing Pop Shell shortcuts"; | ||
| license = licenses.gpl3Only; | ||
| homepage = "https://github.com/pop-os/shell-shortcuts"; | ||
| platforms = platforms.linux; | ||
| maintainers = with maintainers; [ Enzime ]; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| { stdenv, lib, fetchFromGitHub, glib, sassc }: | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| pname = "gnome-shell-extension-cosmic-dock"; | ||
| version = "unstable-2021-11-03"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "pop-os"; | ||
| repo = "cosmic-dock"; | ||
| # from branch `master_impish` | ||
| rev = "acb33c1c25866655e11191a781055ac272acfdc3"; | ||
| sha256 = "sha256-MM5E8T6xWamfi7ABgTgG8WmuX0bvdmZHu8bmys1og2k="; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ glib sassc ]; | ||
|
|
||
| makeFlags = [ "XDG_DATA_HOME=$(out)/share" ]; | ||
|
|
||
| passthru = { | ||
| extensionUuid = "cosmic-dock@system76.com"; | ||
| extensionPortalSlug = "cosmic-dock"; | ||
| }; | ||
|
|
||
| meta = with lib; { | ||
| description = "Cosmic Dock (Pop!_OS fork of Ubuntu Dock)"; | ||
| license = licenses.gpl3Only; | ||
| platforms = platforms.linux; | ||
| maintainers = with maintainers; [ Enzime ]; | ||
| homepage = "https://github.com/pop-os/cosmic-dock"; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| { stdenv, lib, fetchFromGitHub, glib }: | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| pname = "gnome-shell-extension-cosmic-workspaces"; | ||
| version = "unstable-2021-11-03"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "pop-os"; | ||
| repo = "cosmic-workspaces"; | ||
| # from branch `master_impish` | ||
| rev = "678b34bdcdec14471665b87092ca16f6857dac66"; | ||
| sha256 = "sha256-RhdNG9FQRat4mBNfB5G1VflzzyixXfdOUg4BfmPceCQ="; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ glib ]; | ||
|
|
||
| makeFlags = [ "XDG_DATA_HOME=$(out)/share" ]; | ||
|
|
||
| passthru = { | ||
| extensionUuid = "cosmic-workspaces@system76.com"; | ||
| extensionPortalSlug = "cosmic-workspaces"; | ||
| }; | ||
|
|
||
| meta = with lib; { | ||
| description = "Vertically stacked workspaces (Pop!_OS fork)"; | ||
| license = licenses.gpl3Only; | ||
| platforms = platforms.linux; | ||
| maintainers = with maintainers; [ Enzime ]; | ||
| homepage = "https://github.com/pop-os/cosmic-workspaces"; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| { stdenv, lib, fetchFromGitHub, glib }: | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| pname = "gnome-shell-extension-pop-cosmic"; | ||
| version = "unstable-2021-11-03"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "pop-os"; | ||
| repo = "cosmic"; | ||
| # from branch `master_impish` | ||
| rev = "fbcaa2c071330a73e7b13b407e8b7fb0251eeace"; | ||
| sha256 = "sha256-hgEbGG3ZQwSCeMvu8NiPA6SdO+Y2THD/nEoTzRRxdFs="; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ glib ]; | ||
|
|
||
| makeFlags = [ "XDG_DATA_HOME=$(out)/share" ]; | ||
|
|
||
| passthru = { | ||
| extensionUuid = "pop-cosmic@system76.com"; | ||
| extensionPortalSlug = "pop-cosmic"; | ||
| }; | ||
|
|
||
| meta = with lib; { | ||
| description = "Computer Operating System Main Interface Components"; | ||
| license = licenses.gpl3Only; | ||
| platforms = platforms.linux; | ||
| maintainers = with maintainers; [ Enzime ]; | ||
| homepage = "https://github.com/pop-os/cosmic"; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.