From 54b6c5237166c2b35f8b5bd56cf65505287d229c Mon Sep 17 00:00:00 2001
From: arielherself <arielherself@duck.com>
Date: Tue, 13 Aug 2024 22:35:47 +0800
Subject: [PATCH] fix git modules

---
 .gitmodules                    |   3 +
 mypkgs                         |   1 +
 mypkgs.bak/default.nix         |   3 -
 mypkgs.bak/thorium/package.nix | 130 ---------------------------------
 4 files changed, 4 insertions(+), 133 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 mypkgs
 delete mode 100644 mypkgs.bak/default.nix
 delete mode 100644 mypkgs.bak/thorium/package.nix

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..6b6bc40
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "mypkgs"]
+	path = mypkgs
+	url = https://github.com/arielherself/mypkgs
diff --git a/mypkgs b/mypkgs
new file mode 160000
index 0000000..df8c7f6
--- /dev/null
+++ b/mypkgs
@@ -0,0 +1 @@
+Subproject commit df8c7f614534d1702df2735db5d005688dd63731
diff --git a/mypkgs.bak/default.nix b/mypkgs.bak/default.nix
deleted file mode 100644
index ea42e51..0000000
--- a/mypkgs.bak/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    thorium = import ./thorium/package.nix;
-}
diff --git a/mypkgs.bak/thorium/package.nix b/mypkgs.bak/thorium/package.nix
deleted file mode 100644
index 4056bd5..0000000
--- a/mypkgs.bak/thorium/package.nix
+++ /dev/null
@@ -1,130 +0,0 @@
-with import <nixpkgs> {};
-let
-    opusWithCustomModes = pkgs.libopus.override { withCustomModes = true; };
-in
-pkgs.stdenv.mkDerivation rec {
-    name = "thorium-${version}";
-    version = "124.0.6367.218";
-
-    dontPatchELF = true;
-
-    src = pkgs.fetchurl {
-        url = "https://github.com/Alex313031/thorium/releases/download/M${version}/thorium-browser_${version}_AVX2.deb";
-        hash = "sha256-nXz5ocZYDBWLIaARk8lN9LhP+7p8bEx+Kk+JAT2tG5c=";
-    };
-    sourceRoot = ".";
-    unpackPhase = "dpkg-deb --fsys-tarfile ${src} | tar -x --no-same-owner";
-
-
-    rpath = lib.makeLibraryPath buildInputs + ":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs;
-
-
-    nativeBuildInputs = [
-        pkgs.dpkg
-        pkgs.qt6.wrapQtAppsHook
-    ];
-
-    buildInputs = with pkgs; [
-        alsa-lib
-        at-spi2-atk
-        at-spi2-core
-        atk
-        bzip2
-        cairo
-        coreutils
-        cups
-        curl
-        dbus
-        expat
-        flac
-        fontconfig
-        freetype
-        gcc-unwrapped.lib
-        gdk-pixbuf
-        glib
-        harfbuzz
-        icu
-        libcap
-        libdrm
-        liberation_ttf
-        libexif
-        libglvnd
-        libkrb5
-        libpng
-        xorg.libX11
-        xorg.libxcb
-        xorg.libXcomposite
-        xorg.libXcursor
-        xorg.libXdamage
-        xorg.libXext
-        xorg.libXfixes
-        xorg.libXi
-        libxkbcommon
-        xorg.libXrandr
-        xorg.libXrender
-        xorg.libXScrnSaver
-        xorg.libxshmfence
-        xorg.libXtst
-        mesa
-        nspr
-        nss
-        opusWithCustomModes
-        pango
-        pciutils
-        pipewire
-        snappy
-        speechd
-        systemd
-        util-linux
-        wayland
-        wget
-        libpulseaudio
-        libva
-        gtk3
-        gtk4
-        libgcc
-        qt5.full
-        qt6.full
-        qt6.qtbase
-        libGL
-    ];
-
-    # dontConfigure = true;
-    # dontBuild = true;
-
-    installPhase= ''
-        runHook preInstall
-
-        appname=thorium
-
-        mkdir -p $out/bin
-        mkdir -p $out/share
-        cp -R usr/bin $out/
-        cp -R usr/share $out/
-        cp -R opt $out/
-        substituteInPlace $out/share/applications/thorium-browser.desktop --replace /usr/bin/ $out/bin/
-        substituteInPlace $out/share/applications/thorium-shell.desktop --replace /usr/bin/ $out/bin/
-        substituteInPlace $out/share/applications/thorium-shell.desktop --replace /opt/ $out/opt/
-        substituteInPlace $out/bin/thorium-shell --replace /opt/ $out/opt/
-
-        ln -fs ${pkgs.widevine-cdm}/share/google/chrome/WidevineCdm $out/opt/chromium.org/thorium/WidevineCdm
-
-        patchelf $out/opt/chromium.org/thorium/thorium --add-needed libGL.so.1
-        for exe in $out/opt/chromium.org/thorium/{thorium,chrome_crashpad_handler}; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath "${rpath}" $exe
-      done
-
-        ln -fs $out/opt/chromium.org/thorium/thorium-browser $out/bin/thorium-browser
-
-        runHook postInstall
-    '';
-
-    meta = with lib; {
-        homepage = "https://thorium.rocks";
-        description = "Web Browser";
-        platforms = platforms.linux;
-        license = licenses.unfree;
-    };
-}