diff options
| author | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-12-11 21:56:24 -0300 |
|---|---|---|
| committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-12-12 09:41:26 -0300 |
| commit | e88150faaa3afc1b948300b9f2197b1fe7520439 (patch) | |
| tree | 565c7fe9ea3f019f7924a7f2f2ce88cae052d3ef | |
| parent | 0c293b2dd7fc3a5458edb2a6d181a56e38c8f642 (diff) | |
| download | nixpkgs-e88150faaa3afc1b948300b9f2197b1fe7520439.tar nixpkgs-e88150faaa3afc1b948300b9f2197b1fe7520439.tar.gz nixpkgs-e88150faaa3afc1b948300b9f2197b1fe7520439.tar.bz2 nixpkgs-e88150faaa3afc1b948300b9f2197b1fe7520439.tar.lz nixpkgs-e88150faaa3afc1b948300b9f2197b1fe7520439.tar.xz nixpkgs-e88150faaa3afc1b948300b9f2197b1fe7520439.tar.zst nixpkgs-e88150faaa3afc1b948300b9f2197b1fe7520439.zip | |
ftgl: incorporate darwin into its expression
| -rw-r--r-- | pkgs/development/libraries/ftgl/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index 46d6180eb1d..b6554979c7e 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -5,13 +5,15 @@ , doxygen , freeglut , freetype -, GLUT , libGL , libGLU -, OpenGL , pkg-config +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) OpenGL GLUT; +in stdenv.mkDerivation rec { pname = "ftgl"; version = "2.4.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6af0f14cbd4..5c660097a03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7240,9 +7240,7 @@ with pkgs; frostwire = callPackage ../applications/networking/p2p/frostwire { }; frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; - ftgl = callPackage ../development/libraries/ftgl { - inherit (darwin.apple_sdk.frameworks) OpenGL GLUT; - }; + ftgl = callPackage ../development/libraries/ftgl { }; ftop = callPackage ../os-specific/linux/ftop { }; |