diff options
author | bb010g <me@bb010g.com> | 2019-04-18 20:51:16 -0700 |
---|---|---|
committer | Doron Behar <doron.behar@gmail.com> | 2021-10-27 13:21:27 +0300 |
commit | 20ccd74a3620fe0a5a9632522c8dcd46eda9dbd7 (patch) | |
tree | f1ee2b473f1218094f8a1eaacb6f29c608414eb6 | |
parent | a1ed62e586a5c9c09d1f39c78282395becd8e7a9 (diff) | |
download | nixpkgs-20ccd74a3620fe0a5a9632522c8dcd46eda9dbd7.tar nixpkgs-20ccd74a3620fe0a5a9632522c8dcd46eda9dbd7.tar.gz nixpkgs-20ccd74a3620fe0a5a9632522c8dcd46eda9dbd7.tar.bz2 nixpkgs-20ccd74a3620fe0a5a9632522c8dcd46eda9dbd7.tar.lz nixpkgs-20ccd74a3620fe0a5a9632522c8dcd46eda9dbd7.tar.xz nixpkgs-20ccd74a3620fe0a5a9632522c8dcd46eda9dbd7.tar.zst nixpkgs-20ccd74a3620fe0a5a9632522c8dcd46eda9dbd7.zip |
swt: make reproducible
-rw-r--r-- | pkgs/development/libraries/java/swt/default.nix | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index bf35490f9a8..9e56fdf4525 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 |