colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pdfstudio: remove libgccjit dependency

Browse Source 
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`?
This commit is contained in:
Adam Joseph 2023-01-17 21:22:43 -08:00
parent b83bc07b4f
commit 34bb2681f5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/misc/pdfstudio/default.nix
View File

@ -8,10 +8,11 @@
# - year identifies the year portion of the version, defaults to most recent year. # - year identifies the year portion of the version, defaults to most recent year.
# - pname is either "pdfstudio${year}" or "pdfstudioviewer". # - pname is either "pdfstudio${year}" or "pdfstudioviewer".
{ program ? "pdfstudio" { lib
, program ? "pdfstudio"
, year ? "2022" , year ? "2022"
, fetchurl , fetchurl
, libgccjit , gcc
, callPackage , callPackage
, jdk11 , jdk11
, jdk17 , jdk17
@ -49,7 +50,7 @@ in
sha256 = "sha256-wQgVWz2kS+XkrqvCAUishizfDrCwGyVDAAU4Yzj4uYU="; sha256 = "sha256-wQgVWz2kS+XkrqvCAUishizfDrCwGyVDAAU4Yzj4uYU=";
}; };
extraBuildInputs = [ extraBuildInputs = [
libgccjit #for libstdc++.so.6 and libgomp.so.1 (lib.getLib gcc) # for libstdc++.so.6 and libgomp.so.1
]; ];
jdk = jdk11; jdk = jdk11;
}; };
@ -62,7 +63,7 @@ in
sha256 = "sha256-B3RrftuKsPWUWP9hwnq4i311hgZgwZLqG1pJLdilfQI="; sha256 = "sha256-B3RrftuKsPWUWP9hwnq4i311hgZgwZLqG1pJLdilfQI=";
}; };
extraBuildInputs = [ extraBuildInputs = [
libgccjit #for libstdc++.so.6 and libgomp.so.1 (lib.getLib gcc) # for libstdc++.so.6 and libgomp.so.1
]; ];
jdk = jdk17; jdk = jdk17;
}; };