diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-02-07 16:17:39 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-02-19 20:09:16 +0700 |
commit | e03c068af5c9ca950214cd6c3b5cfe67f595da88 (patch) | |
tree | 3a2072763efa4dae7237eeecf46fc6a95ddcd215 /pkgs/applications/misc/sweethome3d | |
parent | 06c2bba257d77f2aeada7f943244d9afd5998645 (diff) | |
download | nixpkgs-e03c068af5c9ca950214cd6c3b5cfe67f595da88.tar nixpkgs-e03c068af5c9ca950214cd6c3b5cfe67f595da88.tar.gz nixpkgs-e03c068af5c9ca950214cd6c3b5cfe67f595da88.tar.bz2 nixpkgs-e03c068af5c9ca950214cd6c3b5cfe67f595da88.tar.lz nixpkgs-e03c068af5c9ca950214cd6c3b5cfe67f595da88.tar.xz nixpkgs-e03c068af5c9ca950214cd6c3b5cfe67f595da88.tar.zst nixpkgs-e03c068af5c9ca950214cd6c3b5cfe67f595da88.zip |
treewide: makeWrapper buildInputs to nativeBuildInputs
Diffstat (limited to 'pkgs/applications/misc/sweethome3d')
-rw-r--r-- | pkgs/applications/misc/sweethome3d/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/misc/sweethome3d/editors.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index afbf5b364ed..e1be229b087 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -34,7 +34,8 @@ let patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so ''; - buildInputs = [ ant jdk makeWrapper p7zip gtk3 gsettings-desktop-schemas ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ant jdk p7zip gtk3 gsettings-desktop-schemas ]; buildPhase = '' ant furniture textures help diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 08bc5b90fd9..c0cdc764dc3 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -23,7 +23,8 @@ let categories = "Graphics;2DGraphics;3DGraphics;"; }; - buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ant jre jdk gtk3 gsettings-desktop-schemas ]; patchPhase = '' sed -i -e 's,../SweetHome3D,${application.src},g' build.xml |