From 7a4e4c9e81c974ec038a2d43c6f1834eeda833d8 Mon Sep 17 00:00:00 2001
From: Jonathan Strickland <djanatyn@gmail.com>
Date: Wed, 11 Nov 2020 19:15:54 -0500
Subject: [PATCH 1/2] licenses: add HPND-sell-variant

---
 lib/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index a704a6884c7d..850de29e7d13 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -392,6 +392,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
     fullName = "Historic Permission Notice and Disclaimer";
   };
 
+  hpndSellVariant = spdx {
+    fullName = "Historical Permission Notice and Disclaimer - sell variant";
+    spdxId = "HPND-sell-variant";
+  };
+
   # Intel's license, seems free
   iasl = {
     fullName = "iASL";

From de39cac1cfbcc296ea698df3e2c68bdc71bdb50a Mon Sep 17 00:00:00 2001
From: Jonathan Strickland <djanatyn@gmail.com>
Date: Wed, 11 Nov 2020 19:16:29 -0500
Subject: [PATCH 2/2] xmountains: init at 2.10

---
 .../graphics/xmountains/default.nix           | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/graphics/xmountains/default.nix

diff --git a/pkgs/applications/graphics/xmountains/default.nix b/pkgs/applications/graphics/xmountains/default.nix
new file mode 100644
index 000000000000..c31f7923c990
--- /dev/null
+++ b/pkgs/applications/graphics/xmountains/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchFromGitHub, xlibsWrapper, xorg }:
+
+stdenv.mkDerivation rec {
+  pname = "xmountains";
+  version = "2.10";
+
+  src = fetchFromGitHub {
+    owner = "spbooth";
+    repo = pname;
+    rev = "aa3bcbfed228adf3fff0fe4295589f13fc194f0b";
+    sha256 = "0dx4n2y736lv04sj41cp1dw8n5zkw5gyd946a6zsiv0k796s9ra9";
+  };
+
+  buildInputs = [ xlibsWrapper xorg.xbitmaps ];
+  nativeBuildInputs = with xorg; [ imake gccmakedep ];
+
+  installPhase = "install -Dm755 xmountains -t $out/bin";
+
+  meta = with lib; {
+    description = "X11 based fractal landscape generator";
+    homepage = "https://spbooth.github.io/xmountains";
+    license = licenses.hpndSellVariant;
+    maintainers = with maintainers; [ djanatyn ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fde911a0a7c2..7f64b0448f57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24688,6 +24688,8 @@ in
     desktopSupport = "xfce4";
   };
 
+  xmountains = callPackage ../applications/graphics/xmountains { };
+
   xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { };
 
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };