diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-01-04 23:27:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-04 23:27:20 +0100 |
| commit | b1a2373aa88dfe8280e575d391978f031ab35a19 (patch) | |
| tree | c60834183e56de9d9897e1c6802349b65f95d55b /pkgs/development/compilers | |
| parent | 5f752ec14b2fc7ed91a3e0a3afb0b2c8c7b377b7 (diff) | |
| parent | c558d50b4566f907ab7360eee1a8916c480e3e65 (diff) | |
Merge pull request #208384 from BenediktBroich/blueprint-compiler
blueprint-compiler: refactor
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/blueprint/default.nix | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/development/compilers/blueprint/default.nix index 7ac0a68be05b9..425ea5766f9c0 100644 --- a/pkgs/development/compilers/blueprint/default.nix +++ b/pkgs/development/compilers/blueprint/default.nix @@ -1,14 +1,13 @@ -{ gtk4 -, python3 -, stdenv -, fetchFromGitLab +{ fetchFromGitLab , gobject-introspection +, gtk4 , lib , meson , ninja +, python3 +, stdenv , testers }: - stdenv.mkDerivation (finalAttrs: { pname = "blueprint-compiler"; version = "0.6.0"; @@ -21,31 +20,27 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-L6EGterkZ8EB6xSnJDZ3IMuOumpTpEGnU74X3UgC7k0="; }; - doCheck = true; - nativeBuildInputs = [ meson ninja ]; buildInputs = [ - python3 - gtk4 - ] ++ (with python3.pkgs; [ - pygobject3 - wrapPython - ]); + (python3.withPackages (ps: with ps; [ + pygobject3 + ])) + ]; propagatedBuildInputs = [ + # For setup hook, so that the compiler can find typelib files gobject-introspection ]; - postFixup = '' - makeWrapperArgs="\ - --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \ - --prefix PYTHONPATH : \"$(toPythonPath $out):$(toPythonPath ${python3.pkgs.pygobject3})\"" - wrapPythonPrograms - ''; + doCheck = true; + + checkInputs = [ + gtk4 + ]; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; |