From 262e5b254b9d3525be74efdf21a98bcc4ba76cdc Mon Sep 17 00:00:00 2001
From: Andy Tockman <andy@tck.mn>
Date: Mon, 9 Mar 2020 15:28:35 -0400
Subject: [PATCH 1/2] qxw: init at 20190909

---
 pkgs/applications/editors/qxw/default.nix | 31 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/editors/qxw/default.nix

diff --git a/pkgs/applications/editors/qxw/default.nix b/pkgs/applications/editors/qxw/default.nix
new file mode 100644
index 000000000000..7c5b6408ceae
--- /dev/null
+++ b/pkgs/applications/editors/qxw/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkg-config, gtk2, pcre }:
+
+let version = "20190909"; in stdenv.mkDerivation {
+  inherit version;
+  pname = "qxw";
+
+  src = fetchurl {
+    url = "https://www.quinapalus.com/qxw-${version}.tar.gz";
+    sha256 = "1w6f2c70lbdbi2dvh3rm463ai20fhfnnxf205kyyl46gz141kz48";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ gtk2 pcre ];
+
+  makeFlags = [ "DESTDIR=$(out)" ];
+
+  patchPhase = ''
+    sed -i 's/ `dpkg-buildflags[^`]*`//g;
+            /mkdir -p/d;
+            s/cp -a/install -D/;
+            s,/usr/games,/bin,' Makefile
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A program to help create and publish crosswords";
+    homepage    = https://www.quinapalus.com/qxw.html;
+    license     = licenses.gpl2;
+    maintainers = [ maintainers.tckmn ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 340408715117..3164a3c9b957 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21324,6 +21324,8 @@ in
 
   qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { };
 
+  qxw = callPackage ../applications/editors/qxw {};
+
   rabbitvcs = callPackage ../applications/version-management/rabbitvcs {};
 
   rakarrack = callPackage ../applications/audio/rakarrack {

From 56cb90bddf1a06249a6a2b4e4cabcea0e65391ff Mon Sep 17 00:00:00 2001
From: Andy Tockman <andy@tck.mn>
Date: Fri, 18 Sep 2020 17:58:38 -0500
Subject: [PATCH 2/2] qxw: 20190909 -> 20200708

---
 pkgs/applications/editors/qxw/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/qxw/default.nix b/pkgs/applications/editors/qxw/default.nix
index 7c5b6408ceae..aed69e4f568b 100644
--- a/pkgs/applications/editors/qxw/default.nix
+++ b/pkgs/applications/editors/qxw/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkg-config, gtk2, pcre }:
 
-let version = "20190909"; in stdenv.mkDerivation {
-  inherit version;
+stdenv.mkDerivation rec {
   pname = "qxw";
+  version = "20200708";
 
   src = fetchurl {
     url = "https://www.quinapalus.com/qxw-${version}.tar.gz";
-    sha256 = "1w6f2c70lbdbi2dvh3rm463ai20fhfnnxf205kyyl46gz141kz48";
+    sha256 = "1si3ila7137c7x4mp3jv1q1mh3jp0p4khir1yz1rwy0mp3znwv7d";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -23,9 +23,9 @@ let version = "20190909"; in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A program to help create and publish crosswords";
-    homepage    = https://www.quinapalus.com/qxw.html;
-    license     = licenses.gpl2;
+    homepage = "https://www.quinapalus.com/qxw.html";
+    license = licenses.gpl2;
     maintainers = [ maintainers.tckmn ];
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
   };
 }