diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-22 19:21:26 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-22 19:21:26 +0000 |
| commit | ea2acbed493e218f696673a004a95829392c5e33 (patch) | |
| tree | c5716552f205bbf4d4addfa4675ea5073786bd06 /nixpkgs/pkgs/development/libraries/qtforkawesome | |
| parent | 06ba6c84f858b011fb1132721e5d5e28fcda4a8a (diff) | |
| parent | 8aa8cd68f4745eb92f003666bfd300f3e67cd9c1 (diff) | |
| download | nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.gz nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.bz2 nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.lz nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.xz nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.zst nixlib-ea2acbed493e218f696673a004a95829392c5e33.zip | |
Merge branch 'staging' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qtforkawesome')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/qtforkawesome/default.nix | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qtforkawesome/default.nix b/nixpkgs/pkgs/development/libraries/qtforkawesome/default.nix index 8fec60db1362..0841c0d457fd 100644 --- a/nixpkgs/pkgs/development/libraries/qtforkawesome/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtforkawesome/default.nix @@ -1,12 +1,12 @@ { stdenv , lib , fetchFromGitHub +, cmake +, qttools +, perl , cpp-utilities , qtutilities -, qttools , qtbase -, cmake -, perl }: let @@ -16,28 +16,29 @@ let rev = "1.2.0"; sha256 = "sha256-zG6/0dWjU7/y/oDZuSEv+54Mchng64LVyV8bluskYzc="; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "qtforkawesome"; version = "0.1.0"; src = fetchFromGitHub { owner = "Martchus"; - repo = pname; - rev = "v${version}"; + repo = "qtforkawesome"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-9e2TCg3itYtHZSvzCoaiIZmgsCMIoebh6C/XWtKz/2Q="; }; - buildInputs = [ - qtbase - cpp-utilities - qtutilities - ]; nativeBuildInputs = [ cmake qttools perl perl.pkgs.YAML ]; + + buildInputs = [ + qtbase + cpp-utilities + qtutilities + ]; cmakeFlags = [ # Current freetype used by NixOS users doesn't support the `.woff2` font # format, so we use ttf. See @@ -55,5 +56,5 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux ++ platforms.darwin; }; -} +}) |