diff --git a/atau-wallpapers/default.nix b/atau-wallpapers/default.nix index ad0c96b..50d4615 100644 --- a/atau-wallpapers/default.nix +++ b/atau-wallpapers/default.nix @@ -1,6 +1,6 @@ -{ stdenv }: +{ lib, stdenv }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "atau-wallpapers"; pname = name; version = "1.0.0"; @@ -8,8 +8,12 @@ stdenv.mkDerivation { src = ./assets; installPhase = '' + runHook preInstall + mkdir -p "$out/share/backgrounds/atau-wallpapers" - mv assets/* "$out/share/backgrounds/atau-wallpapers" + mv * "$out/share/backgrounds/atau-wallpapers/" + + runHook postInstall ''; meta = with lib; { diff --git a/flake.nix b/flake.nix index 8cbd0ce..28994e7 100644 --- a/flake.nix +++ b/flake.nix @@ -8,17 +8,12 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; in { - defaultPackage = pkgs.callPackage ./atau-wallpapers/default.nix { }; + packages = rec { + atau-wallpapers = pkgs.callPackage ./atau-wallpapers/default.nix { }; + theme-platinum9 = pkgs.callPackage ./theme-platinum9/default.nix { }; + + default = theme-platinum9; + }; } ); - - # overlay = final: prev: { - # theme-platinum9 = with final; final.callPackage ./theme-platinum9 { }; - # atau-wallpapers = with final; final.callPackage ./atau-wallpapers { }; - # }; - - # packages.x86_64-linux.default = (import nixpkgs { - # system = "x86_64-linux"; - # overlays = [ self.overlay ]; - # }); } diff --git a/theme-platinum9/default.nix b/theme-platinum9/default.nix index 9c7a3f1..65a8195 100644 --- a/theme-platinum9/default.nix +++ b/theme-platinum9/default.nix @@ -1,13 +1,13 @@ -{ stdenv }: +{ lib, stdenv }: -stdenv.mkDerivation { - pname = "theme-platinum9"; +stdenv.mkDerivation rec { name = "theme-platinum9"; + pname = name; version = "d3d2080c1a2d5772714d089d1dc1daeeb41db008"; src = fetchGit { url = "https://git.atauno.com/atau/Platinum9.git"; - rev = theme-platinum9.version; + rev = version; }; installPhase = ''