From 8f26fcbad5b307e98d0c5c6578f49e936ebaaab8 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Mon, 15 Aug 2022 01:58:35 +0300 Subject: [PATCH] add obsidian --- pkgs-set/overlays/discord-system-electron.nix | 208 ------------------ pkgs-set/overlays/obsidian.nix | 12 + pkgs-set/pkgs-to-export.nix | 6 +- pkgs-set/pkgs/abaddon.nix | 42 ---- pkgs-set/pkgs/gamescope.nix | 104 --------- pkgs-set/pkgs/gaudible.nix | 34 --- users/patriot/default.nix | 2 +- 7 files changed, 15 insertions(+), 393 deletions(-) delete mode 100644 pkgs-set/overlays/discord-system-electron.nix create mode 100644 pkgs-set/overlays/obsidian.nix delete mode 100644 pkgs-set/pkgs/abaddon.nix delete mode 100644 pkgs-set/pkgs/gamescope.nix delete mode 100644 pkgs-set/pkgs/gaudible.nix diff --git a/pkgs-set/overlays/discord-system-electron.nix b/pkgs-set/overlays/discord-system-electron.nix deleted file mode 100644 index b0d7161..0000000 --- a/pkgs-set/overlays/discord-system-electron.nix +++ /dev/null @@ -1,208 +0,0 @@ -final: prev: rec { - discord-system-electron = - prev.callPackage - mkDiscord - rec { - pname = "discord"; - version = "0.0.17"; - binaryName = "Discord"; - desktopName = "Discord"; - src = - prev.fetchurl - { - url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "sha256-NGJzLl1dm7dfkB98pQR3gv4vlldrII6lOMWTuioDExU="; - }; - isWayland = true; - enableVulkan = false; - extraOptions = [ - "--ignore-gpu-blocklist" - "--enable-gpu-rasterization" - "--enable-zero-copy" - "--disable-gpu-driver-bug-workarounds" - ]; - electron = prev.electron_15; - }; - mkDiscord = { - pname, - version, - src, - binaryName, - desktopName, - isWayland ? false, - enableVulkan ? false, - extraOptions ? [], - autoPatchelfHook, - makeDesktopItem, - lib, - stdenv, - wrapGAppsHook, - alsaLib, - at-spi2-atk, - at-spi2-core, - atk, - cairo, - cups, - dbus, - electron, - expat, - fontconfig, - freetype, - gdk-pixbuf, - glib, - gtk3, - libcxx, - libdrm, - libnotify, - libpulseaudio, - libuuid, - libX11, - libXScrnSaver, - libXcomposite, - libXcursor, - libXdamage, - libXext, - libXfixes, - libXi, - libXrandr, - libXrender, - libXtst, - libxcb, - mesa, - nspr, - nss, - pango, - systemd, - libappindicator-gtk3, - libdbusmenu, - nodePackages, - vulkan-loader, - vulkan-extension-layer, - libGL, - pipewire, - }: - stdenv.mkDerivation - rec { - inherit pname version src; - nativeBuildInputs = [ - nodePackages.asar - alsaLib - autoPatchelfHook - cups - libdrm - libuuid - libXdamage - libX11 - libXScrnSaver - libXtst - libxcb - mesa.drivers - nss - wrapGAppsHook - ]; - dontWrapGApps = true; - libPath = - lib.makeLibraryPath - [ - libcxx - systemd - libpulseaudio - stdenv.cc.cc - alsaLib - atk - at-spi2-atk - at-spi2-core - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - libnotify - libX11 - libXcomposite - libuuid - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - nspr - nss - libxcb - pango - systemd - libXScrnSaver - libappindicator-gtk3 - libdbusmenu - vulkan-loader - vulkan-extension-layer - libGL - pipewire - ]; - flags = - ( - lib.optionals - isWayland - [ - "--flag-switches-begin" - "--enable-features=UseOzonePlatform,WebRTCPipeWireCapturer${ - lib.optionalString enableVulkan ",Vulkan" - }" - "--flag-switches-end" - "--ozone-platform=wayland" - "--enable-webrtc-pipewire-capturer" - ] - ) - ++ extraOptions; - installPhase = '' - mkdir -p $out/{bin,usr/lib/${pname},share/pixmaps} - ln -s discord.png $out/share/pixmaps/${pname}.png - ln -s "${desktopItem}/share/applications" $out/share/ - - # HACKS FOR SYSTEM ELECTRON - asar e resources/app.asar resources/app - rm resources/app.asar - sed -i "s|process.resourcesPath|'$out/usr/lib/${pname}'|" resources/app/app_bootstrap/buildInfo.js - sed -i "s|exeDir,|'$out/share/pixmaps',|" resources/app/app_bootstrap/autoStart/linux.js - asar p resources/app resources/app.asar --unpack-dir '**' - rm -rf resources/app - - # Copy Relevanat data - cp -r resources/* $out/usr/lib/${pname}/ - - # Create starter script for discord - echo "#!${stdenv.shell}" > $out/bin/${pname} - echo "exec ${electron}/bin/electron ${lib.concatStringsSep " " flags} $out/usr/lib/${pname}/app.asar \$@" >> $out/bin/${pname} - chmod 755 $out/bin/${pname} - - wrapProgram $out/bin/${pname} \ - "''${gappsWrapperArgs[@]}" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --prefix LD_LIBRARY_PATH : ${libPath} - ''; - desktopItem = - makeDesktopItem - { - name = pname; - exec = pname; - icon = pname; - inherit desktopName; - genericName = meta.description; - categories = ["Network" "InstantMessaging"]; - mimeTypes = ["x-scheme-handler/discord"]; - }; - meta = with lib; { - description = "All-in-one cross-platform voice and text chat for gamers"; - homepage = "https://discordapp.com/"; - downloadPage = "https://discordapp.com/download"; - platforms = ["x86_64-linux"]; - }; - }; -} diff --git a/pkgs-set/overlays/obsidian.nix b/pkgs-set/overlays/obsidian.nix new file mode 100644 index 0000000..e2eeb82 --- /dev/null +++ b/pkgs-set/overlays/obsidian.nix @@ -0,0 +1,12 @@ +final: prev: { + obsidian = prev.obsidian.overrideAttrs (old: { + installPhase = + prev.lib.replaceStrings + ["makeWrapper ${final.electron_17}/bin/electron $out/bin/obsidian"] + [ + ''makeWrapper ${final.electron_20}/bin/electron $out/bin/obsidian \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"'' + ] + old.installPhase; + }); +} diff --git a/pkgs-set/pkgs-to-export.nix b/pkgs-set/pkgs-to-export.nix index 8e018e9..48d7f91 100644 --- a/pkgs-set/pkgs-to-export.nix +++ b/pkgs-set/pkgs-to-export.nix @@ -1,11 +1,9 @@ pkgs: ( pkgs.lib.getAttrs [ - "discord-system-electron" "fractal-next" - "gamescope" - "gaudible" - "abaddon" + "obsidian" + "comic-mono" ] pkgs ) diff --git a/pkgs-set/pkgs/abaddon.nix b/pkgs-set/pkgs/abaddon.nix deleted file mode 100644 index 93945d4..0000000 --- a/pkgs-set/pkgs/abaddon.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - stdenv, - fetchFromGitHub, - gtkmm3, - sqlite, - openssl, - curlWithGnuTls, - nlohmann_json, - pkg-config, - cmake, - ... -}: -stdenv.mkDerivation rec { - pname = "abaddon"; - version = "ccf5afbba959068f34897b75afcd25c65c96d79c"; - - src = fetchFromGitHub { - owner = "uowuo"; - repo = pname; - rev = version; - sha256 = "sha256-PKEly2yBM6UKNi/XEEUvbpTmvNSNJM1lUVMovCHgi50="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - pkg-config - cmake - ]; - - buildInputs = [ - gtkmm3.dev - curlWithGnuTls.dev - sqlite.dev - openssl - nlohmann_json - ]; - - configurePhase = "mkdir build && cd build && cmake .."; - installPhase = "mkdir -p $out/bin && mv abaddon $out/bin/abaddon"; - - doCheck = false; -} diff --git a/pkgs-set/pkgs/gamescope.nix b/pkgs-set/pkgs/gamescope.nix deleted file mode 100644 index 5b3cf33..0000000 --- a/pkgs-set/pkgs/gamescope.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - meson, - pkgconfig, - libdrm, - xorg, - wayland, - wayland-protocols, - libxkbcommon, - libcap, - SDL2, - mesa, - libinput, - pixman, - xcbutilerrors, - xcbutilwm, - glslang, - ninja, - makeWrapper, - xwayland, - libuuid, - xcbutilrenderutil, - pipewire, - stb, - writeText, - wlroots, - vulkan-loader, - vulkan-headers, - libseat, - ... -}: let - stbpc = writeText "stbpc" '' - prefix=${stb} - includedir=''${prefix}/include/stb - Cflags: -I''${includedir} - Name: stb - Version: ${stb.version} - Description: stb - ''; - stb_ = stb.overrideAttrs (oldAttrs: rec { - installPhase = '' - ${oldAttrs.installPhase} - install -Dm644 ${stbpc} $out/lib/pkgconfig/stb.pc - ''; - }); -in - stdenv.mkDerivation rec { - pname = "gamescope"; - version = "3.11.30"; - - src = fetchFromGitHub { - owner = "Plagman"; - repo = "gamescope"; - rev = version; - sha256 = "sha256-dSQrOlQfUZkA8Vrc/Tj9dAWIIBOeb+tAen21fZe3Gto="; - fetchSubmodules = true; - }; - - postInstall = '' - wrapProgram $out/bin/gamescope \ - --prefix PATH : "${lib.makeBinPath [xwayland]}" - ''; - - buildInputs = with xorg; [ - libX11 - libXdamage - libXcomposite - libXrender - libXext - libXxf86vm - libXtst - libdrm - vulkan-loader - wayland - wayland-protocols - libxkbcommon - libcap - SDL2 - mesa - libinput - pixman - xcbutilerrors - xcbutilwm - libXi - libXres - libuuid - xcbutilrenderutil - xwayland - pipewire - wlroots - libseat - ]; - nativeBuildInputs = [meson pkgconfig glslang ninja makeWrapper stb_]; - - meta = with lib; { - description = "The micro-compositor formerly known as steamcompmgr"; - license = licenses.bsd2; - homepage = src.meta.homepage; - platforms = platforms.linux; - maintainers = with maintainers; []; - }; - } diff --git a/pkgs-set/pkgs/gaudible.nix b/pkgs-set/pkgs/gaudible.nix deleted file mode 100644 index 5cf097d..0000000 --- a/pkgs-set/pkgs/gaudible.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - python3, - python3Packages, - pulseaudio, - stdenv, - ... -}: -stdenv.mkDerivation { - pname = "gaudible"; - version = "master"; - - src = builtins.fetchGit { - url = "https://github.com/dbazile/gaudible.git"; - rev = "ccd4ac14589f061c60217fe22120db8786898e4b"; - ref = "refs/heads/master"; - shallow = true; - }; - - buildInputs = [ - python3Packages.pygobject3 - python3Packages.dbus-python - ]; - - installPhase = '' - mkdir -p $out/bin - chmod +x gaudible.py - cp gaudible.py $out/bin/gaudible - ''; - fixupPhase = '' - substituteInPlace $out/bin/gaudible \ - --replace "/usr/bin/paplay" "${pulseaudio}/bin/paplay" \ - --replace "/bin/env python3" "${python3}/bin/python" - ''; -} diff --git a/users/patriot/default.nix b/users/patriot/default.nix index 97afb4b..2fad528 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -172,7 +172,7 @@ in { cloudflared lutris protontricks - inputs.fufexan.packages.${system}.gamescope + obsidian ]; }; programs = {