mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 10:53:11 +00:00
pdfstudio: gcc -> stdenv.cc.cc
This commit is contained in:
parent
34bb2681f5
commit
210852bd51
@ -9,10 +9,10 @@
|
|||||||
# - pname is either "pdfstudio${year}" or "pdfstudioviewer".
|
# - pname is either "pdfstudio${year}" or "pdfstudioviewer".
|
||||||
|
|
||||||
{ lib
|
{ lib
|
||||||
|
, stdenv
|
||||||
, program ? "pdfstudio"
|
, program ? "pdfstudio"
|
||||||
, year ? "2022"
|
, year ? "2022"
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, gcc
|
|
||||||
, callPackage
|
, callPackage
|
||||||
, jdk11
|
, jdk11
|
||||||
, jdk17
|
, jdk17
|
||||||
@ -50,7 +50,7 @@ in
|
|||||||
sha256 = "sha256-wQgVWz2kS+XkrqvCAUishizfDrCwGyVDAAU4Yzj4uYU=";
|
sha256 = "sha256-wQgVWz2kS+XkrqvCAUishizfDrCwGyVDAAU4Yzj4uYU=";
|
||||||
};
|
};
|
||||||
extraBuildInputs = [
|
extraBuildInputs = [
|
||||||
(lib.getLib gcc) # for libstdc++.so.6 and libgomp.so.1
|
(lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1
|
||||||
];
|
];
|
||||||
jdk = jdk11;
|
jdk = jdk11;
|
||||||
};
|
};
|
||||||
@ -63,7 +63,7 @@ in
|
|||||||
sha256 = "sha256-B3RrftuKsPWUWP9hwnq4i311hgZgwZLqG1pJLdilfQI=";
|
sha256 = "sha256-B3RrftuKsPWUWP9hwnq4i311hgZgwZLqG1pJLdilfQI=";
|
||||||
};
|
};
|
||||||
extraBuildInputs = [
|
extraBuildInputs = [
|
||||||
(lib.getLib gcc) # for libstdc++.so.6 and libgomp.so.1
|
(lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1
|
||||||
];
|
];
|
||||||
jdk = jdk17;
|
jdk = jdk17;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user