diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-30 13:30:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 10:13:20 +0000 |
| commit | f2e61678de300336b3666afd19af7565efb0c4cf (patch) | |
| tree | 49f6906c9d557f7fdd58257ff85ec17fc4495f31 /nixpkgs/pkgs/applications/misc/nix-tour | |
| parent | f920d5e07c29a9aa1b77d9b88bd604cf1a1f3664 (diff) | |
| parent | 00e27c78d3d2de6964096ceee8d70e5b487365e3 (diff) | |
| download | nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.gz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.bz2 nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.lz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.xz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.zst nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.zip | |
Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/nix-tour')
| -rw-r--r-- | nixpkgs/pkgs/applications/misc/nix-tour/default.nix | 54 |
1 files changed, 35 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/applications/misc/nix-tour/default.nix b/nixpkgs/pkgs/applications/misc/nix-tour/default.nix index 57b1b6256906..b7485255b8a8 100644 --- a/nixpkgs/pkgs/applications/misc/nix-tour/default.nix +++ b/nixpkgs/pkgs/applications/misc/nix-tour/default.nix @@ -1,34 +1,50 @@ -{ lib, stdenv, fetchgit, electron, runtimeShell } : +{ lib +, stdenv +, fetchFromGitHub +, electron +, runtimeShell +, makeWrapper +, copyDesktopItems +, makeDesktopItem +}: stdenv.mkDerivation rec { pname = "nix-tour"; - version = "0.0.1"; + version = "unstable-2022-01-03"; - buildInputs = [ electron ]; - - src = fetchgit { - url = "https://github.com/nixcloud/tour_of_nix"; - rev = "v${version}"; - sha256 = "09b1vxli4zv1nhqnj6c0vrrl51gaira94i8l7ww96fixqxjgdwvb"; + src = fetchFromGitHub { + owner = "nixcloud"; + repo = "tour_of_nix"; + rev = "6a6784983e6dc121574b97eb9b1d03592c8cb9a7"; + sha256 = "sha256-BhQz59wkwwY0ShXzqUD6MQl4NE/jUik5RbLzseEc5Bc="; }; + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; + buildInputs = [ electron ]; + installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share - cp -R * $out/share - chmod 0755 $out/share/ -R - echo "#!${runtimeShell}" > $out/bin/nix-tour - echo "cd $out/share/" >> $out/bin/nix-tour - echo "${electron}/bin/electron $out/share/electron-main.js" >> $out/bin/nix-tour - chmod 0755 $out/bin/nix-tour + install -d $out/bin $out/share/nix-tour + cp -R * $out/share/nix-tour + makeWrapper ${electron}/bin/electron $out/bin/nix-tour \ + --add-flags $out/share/nix-tour/electron-main.js ''; + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "Tour of Nix"; + genericName = "Tour of Nix"; + comment = + "Interactive programming guide dedicated to the nix programming language"; + categories = [ "Development" "Documentation" ]; + exec = "nix-tour"; + }) + ]; + meta = with lib; { description = "'the tour of nix' from nixcloud.io/tour as offline version"; homepage = "https://nixcloud.io/tour"; license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ qknight ]; + maintainers = with maintainers; [ qknight yuu ]; }; - } |