From 6e77a7c4e8f5731ac631b46910b52716b9478167 Mon Sep 17 00:00:00 2001 From: rhiannon morris Date: Fri, 13 Dec 2024 18:44:40 +0100 Subject: [PATCH 1/3] overlay --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index d69b3bf..015d92f 100644 --- a/flake.nix +++ b/flake.nix @@ -6,5 +6,6 @@ packages.${system}.inkscape-xwayland = i-w; apps.${system}.default = { type = "app"; program = "${i-w}/bin/inkscape-xwayland"; }; + overlays.default = final: prev: { inkscape-xwayland = i-w; }; }; } From 832d2fe6744d7cfd84945c5ae046c46126c74748 Mon Sep 17 00:00:00 2001 From: rhiannon morris Date: Fri, 13 Dec 2024 18:50:33 +0100 Subject: [PATCH 2/3] rename package file --- inkscape-x11.nix => inkscape-xwayland.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename inkscape-x11.nix => inkscape-xwayland.nix (100%) diff --git a/inkscape-x11.nix b/inkscape-xwayland.nix similarity index 100% rename from inkscape-x11.nix rename to inkscape-xwayland.nix From 875da4301a40bbf2f8a5951d510cc2556ed5b9ce Mon Sep 17 00:00:00 2001 From: rhiannon morris Date: Fri, 13 Dec 2024 18:51:04 +0100 Subject: [PATCH 3/3] call the executable inkscape. whatever --- flake.nix | 6 +++--- inkscape-xwayland.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 015d92f..8e9b88f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,11 +1,11 @@ { outputs = { self, nixpkgs }: let system = "x86_64-linux"; - i-w = nixpkgs.legacyPackages.${system}.callPackage ./inkscape-x11.nix { }; + pkgs = nixpkgs.legacyPackages.${system}; + i-w = pkgs.callPackage ./inkscape-xwayland.nix { }; in { packages.${system}.inkscape-xwayland = i-w; - apps.${system}.default = - { type = "app"; program = "${i-w}/bin/inkscape-xwayland"; }; + apps.${system}.default = { type = "app"; program = "${i-w}/bin/inkscape"; }; overlays.default = final: prev: { inkscape-xwayland = i-w; }; }; } diff --git a/inkscape-xwayland.nix b/inkscape-xwayland.nix index aa1d4bf..49ba505 100644 --- a/inkscape-xwayland.nix +++ b/inkscape-xwayland.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { dontUnpack = true; dontFixup = true; installPhase = '' mkdir -p $out/bin - cp ${script} $out/bin/inkscape-xwayland + cp ${script} $out/bin/inkscape ''; }