diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-07-15 12:15:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-07-15 12:15:56 +0200 |
| commit | e2b7b09960037a0e77a775d76f913d9c292ba0cf (patch) | |
| tree | ce07774b774ed2e6fd4a1e6d0ce10f01bf34a6cf /pkgs/build-support | |
| parent | 7d80f94f754f848410b6a3be831bee7c9e82174a (diff) | |
| parent | 071693e5df98a7493f8a62eaf0d190d02e285740 (diff) | |
| download | nixlib-e2b7b09960037a0e77a775d76f913d9c292ba0cf.tar nixlib-e2b7b09960037a0e77a775d76f913d9c292ba0cf.tar.gz nixlib-e2b7b09960037a0e77a775d76f913d9c292ba0cf.tar.bz2 nixlib-e2b7b09960037a0e77a775d76f913d9c292ba0cf.tar.lz nixlib-e2b7b09960037a0e77a775d76f913d9c292ba0cf.tar.xz nixlib-e2b7b09960037a0e77a775d76f913d9c292ba0cf.tar.zst nixlib-e2b7b09960037a0e77a775d76f913d9c292ba0cf.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/make-startupitem/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 4ebe3c0615d3..e06be51f4a4e 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -42,7 +42,7 @@ rec { cp ${./tarsum.go} tarsum.go export GOPATH=$(pwd) mkdir src - ln -sT ${docker.src}/pkg/tarsum src/tarsum + ln -sT ${docker.src}/components/engine/pkg/tarsum src/tarsum go build cp tarsum $out diff --git a/pkgs/build-support/make-startupitem/default.nix b/pkgs/build-support/make-startupitem/default.nix index fad6f00d8211..da1d4105c89f 100644 --- a/pkgs/build-support/make-startupitem/default.nix +++ b/pkgs/build-support/make-startupitem/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation { priority = 5; buildCommand = '' - mkdir -p $out/share/autostart + mkdir -p $out/etc/xdg/autostart target=${name}.desktop cp ${package}/share/applications/${srcPrefix}${name}.desktop $target chmod +rw $target echo "X-KDE-autostart-phase=${phase}" >> $target ${lib.optionalString (after != null) ''echo "${after}" >> $target''} ${lib.optionalString (condition != null) ''echo "${condition}" >> $target''} - cp $target $out/share/autostart + cp $target $out/etc/xdg/autostart ''; # this will automatically put 'package' in the environment when you |