diff --git a/flake.lock b/flake.lock index ac07b55..49de800 100644 --- a/flake.lock +++ b/flake.lock @@ -73,6 +73,22 @@ "type": "github" } }, + "nixpkgs-rpdfix": { + "locked": { + "lastModified": 1671661856, + "narHash": "sha256-8y4fBAENBtYdH2vtvwo6eUn8UbygMiXWSKVn7XrkOy4=", + "owner": "callahad", + "repo": "nixpkgs", + "rev": "9f60e3c05331f5f2a01451c763aed63b8dc7439a", + "type": "github" + }, + "original": { + "owner": "callahad", + "repo": "nixpkgs", + "rev": "9f60e3c05331f5f2a01451c763aed63b8dc7439a", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1672262501, @@ -95,6 +111,7 @@ "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", + "nixpkgs-rpdfix": "nixpkgs-rpdfix", "nixpkgs-unstable": "nixpkgs-unstable" } }, diff --git a/flake.nix b/flake.nix index eb4b539..b8c1003 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; # required to fix Rapid Photo Downloader + nixpkgs-rpdfix.url = "github:callahad/nixpkgs?rev=9f60e3c05331f5f2a01451c763aed63b8dc7439a"; # look here for the hardware options https://github.com/NixOS/nixos-hardware/blob/master/flake.nix#L5 nixos-hardware.url = "github:nixos/nixos-hardware"; @@ -24,6 +25,7 @@ , agenix , nixpkgs , nixpkgs-unstable + , nixpkgs-rpdfix , nixos-hardware , home-manager }: diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix index aa9150b..c43a605 100644 --- a/home-manager/desktop.nix +++ b/home-manager/desktop.nix @@ -16,7 +16,7 @@ "${custom.inputs.self}/home-manager/software/mpv" "${custom.inputs.self}/home-manager/software/nitrogen" "${custom.inputs.self}/home-manager/software/obsidian" - "${custom.inputs.self}/home-manager/software/rapid-photo-downloader" + (import "${custom.inputs.self}/home-manager/software/rapid-photo-downloader" { inherit custom; }) "${custom.inputs.self}/home-manager/software/signal" "${custom.inputs.self}/home-manager/software/ssh" "${custom.inputs.self}/home-manager/software/starship" diff --git a/home-manager/software/rapid-photo-downloader/default.nix b/home-manager/software/rapid-photo-downloader/default.nix index 4ecf34a..9f59384 100644 --- a/home-manager/software/rapid-photo-downloader/default.nix +++ b/home-manager/software/rapid-photo-downloader/default.nix @@ -1,7 +1,12 @@ -{ pkgs, ... }: +{ custom }: { pkgs, ... }: +let + rpdfix = import custom.inputs.nixpkgs-rpdfix { + system = "x86_64-linux"; + }; +in { - home.packages = with pkgs; [ - rapid-photo-downloader + home.packages = [ + rpdfix.rapid-photo-downloader ]; home.file.".config/Rapid Photo Downloader".source = ./config; }