diff --git a/nix/default.nix b/nix/default.nix deleted file mode 100644 index 5840427..0000000 --- a/nix/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -# Build the PrivateStorage client as a Python application. -{ pkgs ? import { } }: -pkgs.callPackage ./gridsync.nix { } diff --git a/nix/gridsync-repo.nix b/nix/gridsync-repo.nix deleted file mode 100644 index 782e1ad..0000000 --- a/nix/gridsync-repo.nix +++ /dev/null @@ -1,9 +0,0 @@ -let - pkgs = import {}; -in - pkgs.fetchFromGitHub { - owner = "gridsync"; - repo = "gridsync"; - rev = "fcfaecbc18391248b11e5f8c7b80a5526f79f624"; - sha256 = "0cwjryj778rijxnvmghip0gmly1z7gn1bbbsczpmcvpsqj3a9i39"; - } diff --git a/nix/gridsync.nix b/nix/gridsync.nix deleted file mode 100644 index a18c563..0000000 --- a/nix/gridsync.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ pkgs }: -let - repo = import ./gridsync-repo.nix; - gridsync = pkgs.callPackage "${repo}/nix" { }; - psio-src = ../.; - assets = [ - { src = "${psio-src}/assets/PrivateStorage*"; dst = "images/"; } - { src = "${psio-src}/assets/PrivateStorage*"; dst = "gridsync/resources/"; } - { src = "${psio-src}/assets/PrivateStorage.png"; dst = "gridsync/resources/tahoe-lafs.png"; } - { src = "${psio-src}/credentials/*.json"; dst = "gridsync/resources/providers/"; } - { src = "${psio-src}/build/config.txt"; dst = "gridsync/resources/"; } - { src = "${psio-src}/scripts/*"; dst = "./"; } - { src = "gridsync/resources/laptop.png"; dst = "gridsync/resources/laptop-with-icon.png"; } - ]; - apply-branding = assets: - if builtins.length assets == 0 then - "" - else - '' - cp ${(builtins.head assets).src} ${(builtins.head assets).dst} - ${apply-branding (builtins.tail assets)} - ''; -in - gridsync.overrideAttrs (old: { - name = "PrivateStorageDesktop"; - - prePatch = '' - # Replicate PrivateStorageDesktop `make source` logic here. - ${apply-branding assets} - ${if old ? prePatch then old.prePatch else ""} - ''; -}) diff --git a/nix/shell.nix b/nix/shell.nix deleted file mode 100644 index bae966a..0000000 --- a/nix/shell.nix +++ /dev/null @@ -1,17 +0,0 @@ -# Create an environment for development of the client or an easy way to run -# it. `nix-shell` gives a development environment. `nix-shell -A using` -# gives an environment with the client installed and ready to be run. -{ pkgs ? import { } }: -let - gridsync = (pkgs.callPackage ./default.nix { }); - # Just create another derivation that has gridsync as a dependency. - using = pkgs.stdenv.mkDerivation { - name = "gridsync"; - src = ./.; - buildInputs = [ gridsync ]; - }; -in - # Expose gridsync with the extra using attribute. - gridsync // { - inherit using; - }