diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
| commit | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (patch) | |
| tree | c3b5c34b1c533f5c231dc6707e96795fb3a9a138 /nixpkgs/doc/functions | |
| parent | 44e04ea2730f8e3b863b81b0056babe233c244f6 (diff) | |
| parent | 1036dc664169b32613ec11b58cc1740c7511a340 (diff) | |
| download | nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.gz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.bz2 nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.lz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.xz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.zst nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.zip | |
Merge commit '1036dc664169b32613ec11b58cc1740c7511a340'
Diffstat (limited to 'nixpkgs/doc/functions')
| -rw-r--r-- | nixpkgs/doc/functions/snap/example-firefox.nix | 28 | ||||
| -rw-r--r-- | nixpkgs/doc/functions/snap/example-hello.nix | 12 | ||||
| -rw-r--r-- | nixpkgs/doc/functions/snaptools.xml | 4 |
3 files changed, 42 insertions, 2 deletions
diff --git a/nixpkgs/doc/functions/snap/example-firefox.nix b/nixpkgs/doc/functions/snap/example-firefox.nix new file mode 100644 index 000000000000..d58c98a65a2e --- /dev/null +++ b/nixpkgs/doc/functions/snap/example-firefox.nix @@ -0,0 +1,28 @@ +let + inherit (import <nixpkgs> { }) snapTools firefox; +in snapTools.makeSnap { + meta = { + name = "nix-example-firefox"; + summary = firefox.meta.description; + architectures = [ "amd64" ]; + apps.nix-example-firefox = { + command = "${firefox}/bin/firefox"; + plugs = [ + "pulseaudio" + "camera" + "browser-support" + "avahi-observe" + "cups-control" + "desktop" + "desktop-legacy" + "gsettings" + "home" + "network" + "mount-observe" + "removable-media" + "x11" + ]; + }; + confinement = "strict"; + }; +} diff --git a/nixpkgs/doc/functions/snap/example-hello.nix b/nixpkgs/doc/functions/snap/example-hello.nix new file mode 100644 index 000000000000..123da80c5477 --- /dev/null +++ b/nixpkgs/doc/functions/snap/example-hello.nix @@ -0,0 +1,12 @@ +let + inherit (import <nixpkgs> { }) snapTools hello; +in snapTools.makeSnap { + meta = { + name = "hello"; + summary = hello.meta.description; + description = hello.meta.longDescription; + architectures = [ "amd64" ]; + confinement = "strict"; + apps.hello.command = "${hello}/bin/hello"; + }; +} diff --git a/nixpkgs/doc/functions/snaptools.xml b/nixpkgs/doc/functions/snaptools.xml index a951c36730d3..d0e3efdf6c67 100644 --- a/nixpkgs/doc/functions/snaptools.xml +++ b/nixpkgs/doc/functions/snaptools.xml @@ -38,7 +38,7 @@ <para> The following expression packages GNU Hello as a Snapcraft snap. </para> -<programlisting><xi:include href="../../pkgs/build-support/snap/example-hello.nix" parse="text" /></programlisting> +<programlisting><xi:include href="./snap/example-hello.nix" parse="text" /></programlisting> <para> <command>nix-build</command> this expression and install it with <command>snap install ./result --dangerous</command>. @@ -57,7 +57,7 @@ example uses Firefox as an example, because it is one of the most complicated programs we could package. </para> -<programlisting><xi:include href="../../pkgs/build-support/snap/example-firefox.nix" parse="text" /></programlisting> +<programlisting><xi:include href="./snap/example-firefox.nix" parse="text" /></programlisting> <para> <command>nix-build</command> this expression and install it with <command>snap install ./result --dangerous</command>. |