diff options
| -rw-r--r-- | pkgs/applications/graphics/pencil/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/compilers/dtc/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 33 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index e6e72cfd6e6a..19c6334d1d60 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xulrunner }: +{ stdenv, fetchurl, makeWrapper, xulrunner }: stdenv.mkDerivation rec { version = "2.0.11"; @@ -12,15 +12,19 @@ stdenv.mkDerivation rec { buildPhase = ""; + buildInputs = [ makeWrapper ]; + installPhase = '' mkdir -p "$out" cp -r usr/* "$out" - sed -e "s|/usr/bin/xulrunner|${xulrunner}/bin/xulrunner|" \ - -e "s|/usr/share/evolus-pencil|$out/share/evolus-pencil|" \ + sed -e "s|/usr/share/evolus-pencil|$out/share/evolus-pencil|" \ -i "$out/bin/pencil" sed -e "s|/usr/bin/pencil|$out/bin/pencil|" \ -e "s|Icon=.*|Icon=$out/share/evolus-pencil/skin/classic/icon.svg|" \ -i "$out/share/applications/pencil.desktop" + + wrapProgram $out/bin/pencil \ + --prefix PATH ":" ${xulrunner}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix new file mode 100644 index 000000000000..84673dfc7245 --- /dev/null +++ b/pkgs/development/compilers/dtc/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, flex, bison }: + +stdenv.mkDerivation rec { + name = "dtc-${version}"; + version = "1.4.1"; + + src = fetchgit { + url = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git"; + rev = "refs/tags/v${version}"; + sha256 = "0z7yrv0sdhsh5wwy7yd1fvs4pqaq0n9m5i8w65lyibg77ahkasdg"; + }; + + buildInputs = [ flex bison ]; + + installFlags = [ "INSTALL=install" "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Device Tree Compiler"; + homepage = https://git.kernel.org/cgit/utils/dtc/dtc.git; + license = licenses.gpl2; # dtc itself is GPLv2, libfdt is dual GPL/BSD + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e028080155c..ac6607daf92d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1318,6 +1318,8 @@ let dtach = callPackage ../tools/misc/dtach { }; + dtc = callPackage ../development/compilers/dtc { }; + dub = callPackage ../development/tools/build-managers/dub { }; duff = callPackage ../tools/filesystems/duff { }; |