about summary refs log tree commit diff
path: root/pkgs/development/tools/misc
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2017-07-01 20:54:16 +0200
committerJoachim Fasting <joachifm@fastmail.fm>2017-07-01 21:41:27 +0200
commit6e36e7f209e9177a4f73cb7576ebb546607fe052 (patch)
tree1b0543853fcb97cf50bf0d8cd130cc0f9efd139f /pkgs/development/tools/misc
parentb1ae3131114d470a18884b45e753b866f0a079ec (diff)
downloadnixlib-6e36e7f209e9177a4f73cb7576ebb546607fe052.tar
nixlib-6e36e7f209e9177a4f73cb7576ebb546607fe052.tar.gz
nixlib-6e36e7f209e9177a4f73cb7576ebb546607fe052.tar.bz2
nixlib-6e36e7f209e9177a4f73cb7576ebb546607fe052.tar.lz
nixlib-6e36e7f209e9177a4f73cb7576ebb546607fe052.tar.xz
nixlib-6e36e7f209e9177a4f73cb7576ebb546607fe052.tar.zst
nixlib-6e36e7f209e9177a4f73cb7576ebb546607fe052.zip
gede: replace build.patch with inline sed call
The patch file is much larger than the logical change made.
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r--pkgs/development/tools/misc/gede/build.patch11
-rw-r--r--pkgs/development/tools/misc/gede/default.nix5
2 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/development/tools/misc/gede/build.patch b/pkgs/development/tools/misc/gede/build.patch
deleted file mode 100644
index bdd8b7ff5f96..000000000000
--- a/pkgs/development/tools/misc/gede/build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build.py	2017-01-16 21:12:43.000000000 +0100
-+++ b/build.py	2017-02-26 22:03:11.394625315 +0100
-@@ -71,7 +71,7 @@
-         if do_build:
-             if not os.path.exists("Makefile"):
-                 print("Generating makefile")
--                if subprocess.call(['qmake-qt4']):
-+                if subprocess.call(['qmake']):
-                     exit(1)
- 
-             print("Compiling (please wait)")
diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix
index 5667e496a70a..71a34886bc35 100644
--- a/pkgs/development/tools/misc/gede/default.nix
+++ b/pkgs/development/tools/misc/gede/default.nix
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ ctags qt4 python ];
-  patches = [ ./build.patch ];
+
+  postPatch = ''
+    sed -i build.py -e 's,qmake-qt4,qmake,'
+  '';
 
   unpackPhase = ''
     tar xf ${src}