diff options
author | Adam Joseph <adam@westernsemico.com> | 2023-01-17 21:22:43 -0800 |
---|---|---|
committer | Adam Joseph <adam@westernsemico.com> | 2023-01-17 21:23:10 -0800 |
commit | 34bb2681f5daa536f2ef9a9777644823d24e66f7 (patch) | |
tree | 909da19351a98f85365bd290de080930433ca2e5 /pkgs/applications/misc/pdfstudio | |
parent | b83bc07b4f629f84de64c69da7a03c1b09fff5f8 (diff) |
pdfstudio: remove libgccjit dependency
I don't think pdfstudio depends on libgccjit. If it did, that would be a license violation. Unlike the other libraries in gcc, libgccjit is licensed GPLv3 with no exceptions, since libgccjit contains the entire compiler. I wasn't able to build pdfstudio2022 prior to this PR due to openjdk breakage. However I did download and extract the `.deb` used, and ran this command, which produced no outputs: ``` find . -name \*.so -exec ldd {} \; | grep libgccjit ``` Maybe somebody confused `libgccjit` with (may it rest in peace) `libgcj`?
Diffstat (limited to 'pkgs/applications/misc/pdfstudio')
-rw-r--r-- | pkgs/applications/misc/pdfstudio/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index f1ce2219ba891..88af09a83ab2b 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -8,10 +8,11 @@ # - year identifies the year portion of the version, defaults to most recent year. # - pname is either "pdfstudio${year}" or "pdfstudioviewer". -{ program ? "pdfstudio" +{ lib +, program ? "pdfstudio" , year ? "2022" , fetchurl -, libgccjit +, gcc , callPackage , jdk11 , jdk17 @@ -49,7 +50,7 @@ in sha256 = "sha256-wQgVWz2kS+XkrqvCAUishizfDrCwGyVDAAU4Yzj4uYU="; }; extraBuildInputs = [ - libgccjit #for libstdc++.so.6 and libgomp.so.1 + (lib.getLib gcc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk11; }; @@ -62,7 +63,7 @@ in sha256 = "sha256-B3RrftuKsPWUWP9hwnq4i311hgZgwZLqG1pJLdilfQI="; }; extraBuildInputs = [ - libgccjit #for libstdc++.so.6 and libgomp.so.1 + (lib.getLib gcc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk17; }; |