From 20ccd74a3620fe0a5a9632522c8dcd46eda9dbd7 Mon Sep 17 00:00:00 2001
From: bb010g <me@bb010g.com>
Date: Thu, 18 Apr 2019 20:51:16 -0700
Subject: swt: make reproducible

---
 pkgs/development/libraries/java/swt/default.nix | 26 ++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'pkgs/development/libraries/java')

diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix
index bf35490f9a889..9e56fdf452521 100644
--- a/pkgs/development/libraries/java/swt/default.nix
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, lib, fetchurl, unzip, jdk, pkg-config, gtk2
-, libXt, libXtst, libXi, libGLU, libGL, webkitgtk, libsoup, xorg
-, pango, gdk-pixbuf, glib
+{ lib, stdenv, fetchurl, canonicalize-jars-hook
+, gtk2, jdk, libGL, libGLU, libXi, libXt, libXtst, libsoup, webkitgtk
+, gdk-pixbuf, glib, pango, xorg
+, unzip, pkg-config
 }:
 
 let
@@ -35,11 +36,22 @@ in stdenv.mkDerivation rec {
 
   sourceRoot = ".";
 
-  nativeBuildInputs = [ unzip pkg-config ];
-  buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU libGL webkitgtk libsoup ];
+  nativeBuildInputs = [ canonicalize-jars-hook unzip pkg-config ];
+  buildInputs = [
+    gtk2
+    jdk
+    libGL
+    libGLU
+    libXi
+    libXt
+    libXtst
+    libsoup
+    webkitgtk
+  ];
 
-  NIX_LFLAGS = toString (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) +
-    " -lX11 -lpango-1.0 -lgdk_pixbuf-2.0 -lglib-2.0";
+  NIX_LFLAGS = toString
+    ((map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) ++
+      [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ]);
 
   buildPhase = ''
     unzip src.zip -d src
-- 
cgit 1.4.1