diff options
author | Artturi <Artturin@artturin.com> | 2023-08-13 20:41:59 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-13 20:41:59 +0300 |
commit | c4ff6e3885140af0417c795bd9ca2c0f46e9cdd1 (patch) | |
tree | 3c4c1455ece154a9db46509c174e5062f88470c1 /pkgs/desktops | |
parent | 8b1e485458facd839abb2778b3fcf85ccc4045a1 (diff) | |
parent | 408a6b0c1d5c309511795a2950533bd7da0448e8 (diff) | |
download | nixpkgs-c4ff6e3885140af0417c795bd9ca2c0f46e9cdd1.tar nixpkgs-c4ff6e3885140af0417c795bd9ca2c0f46e9cdd1.tar.gz nixpkgs-c4ff6e3885140af0417c795bd9ca2c0f46e9cdd1.tar.bz2 nixpkgs-c4ff6e3885140af0417c795bd9ca2c0f46e9cdd1.tar.lz nixpkgs-c4ff6e3885140af0417c795bd9ca2c0f46e9cdd1.tar.xz nixpkgs-c4ff6e3885140af0417c795bd9ca2c0f46e9cdd1.tar.zst nixpkgs-c4ff6e3885140af0417c795bd9ca2c0f46e9cdd1.zip |
Merge pull request #247841 from uninsane/pr-cross-engrampaD
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/mate/engrampa/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index b781251a7ca..bdac030ed34 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -6,11 +6,12 @@ , itstool , libxml2 , gtk3 -, file , mate , hicolor-icon-theme , wrapGAppsHook , mateUpdateScript +# can be defaulted to true once engrampa builds with meson (version > 1.27.0) +, withMagic ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, file }: stdenv.mkDerivation rec { @@ -26,20 +27,22 @@ stdenv.mkDerivation rec { pkg-config gettext itstool + libxml2 # for xmllint wrapGAppsHook ]; buildInputs = [ - libxml2 gtk3 - file #libmagic mate.caja hicolor-icon-theme mate.mate-desktop + ] ++ lib.optionals withMagic [ + file ]; configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" + ] ++ lib.optionals withMagic [ "--enable-magic" ]; |